diff --git a/native/chat/settings/color-selector-modal.react.js b/native/chat/settings/color-selector-modal.react.js
--- a/native/chat/settings/color-selector-modal.react.js
+++ b/native/chat/settings/color-selector-modal.react.js
@@ -94,10 +94,18 @@
       dispatchActionPromise(
         changeThreadSettingsActionTypes,
         editColor(colorEditValue),
-        { customKeyName: `${changeThreadSettingsActionTypes.started}:color` },
+        {
+          customKeyName: `${changeThreadSettingsActionTypes.started}:${props.route.params.threadInfo.id}:color`,
+        },
       );
     },
-    [setColor, close, dispatchActionPromise, editColor],
+    [
+      setColor,
+      close,
+      dispatchActionPromise,
+      editColor,
+      props.route.params.threadInfo.id,
+    ],
   );
 
   const { colorSelectorContainer, closeButton, closeButtonIcon } = props.styles;
diff --git a/native/chat/settings/thread-settings-color.react.js b/native/chat/settings/thread-settings-color.react.js
--- a/native/chat/settings/thread-settings-color.react.js
+++ b/native/chat/settings/thread-settings-color.react.js
@@ -99,16 +99,16 @@
   },
 };
 
-const loadingStatusSelector = createLoadingStatusSelector(
-  changeThreadSettingsActionTypes,
-  `${changeThreadSettingsActionTypes.started}:color`,
-);
-
 const ConnectedThreadSettingsColor: React.ComponentType<BaseProps> =
   React.memo<BaseProps>(function ConnectedThreadSettingsColor(
     props: BaseProps,
   ) {
-    const loadingStatus = useSelector(loadingStatusSelector);
+    const loadingStatus = useSelector(state =>
+      createLoadingStatusSelector(
+        changeThreadSettingsActionTypes,
+        `${changeThreadSettingsActionTypes.started}:${props.threadInfo.id}:color`,
+      )(state),
+    );
     const colors = useColors();
     const styles = useStyles(unboundStyles);
     return (
diff --git a/native/chat/settings/thread-settings-description.react.js b/native/chat/settings/thread-settings-description.react.js
--- a/native/chat/settings/thread-settings-description.react.js
+++ b/native/chat/settings/thread-settings-description.react.js
@@ -211,7 +211,7 @@
       changeThreadSettingsActionTypes,
       editDescriptionPromise,
       {
-        customKeyName: `${changeThreadSettingsActionTypes.started}:description`,
+        customKeyName: `${changeThreadSettingsActionTypes.started}:${this.props.threadInfo.id}:description`,
       },
     );
     editDescriptionPromise.then(() => {
@@ -289,16 +289,16 @@
   },
 };
 
-const loadingStatusSelector = createLoadingStatusSelector(
-  changeThreadSettingsActionTypes,
-  `${changeThreadSettingsActionTypes.started}:description`,
-);
-
 const ConnectedThreadSettingsDescription: React.ComponentType<BaseProps> =
   React.memo<BaseProps>(function ConnectedThreadSettingsDescription(
     props: BaseProps,
   ) {
-    const loadingStatus = useSelector(loadingStatusSelector);
+    const loadingStatus = useSelector(state =>
+      createLoadingStatusSelector(
+        changeThreadSettingsActionTypes,
+        `${changeThreadSettingsActionTypes.started}:${props.threadInfo.id}:description`,
+      )(state),
+    );
     const colors = useColors();
     const styles = useStyles(unboundStyles);
 
diff --git a/native/chat/settings/thread-settings-leave-thread.react.js b/native/chat/settings/thread-settings-leave-thread.react.js
--- a/native/chat/settings/thread-settings-leave-thread.react.js
+++ b/native/chat/settings/thread-settings-leave-thread.react.js
@@ -96,6 +96,9 @@
     this.props.dispatchActionPromise(
       leaveThreadActionTypes,
       this.leaveThread(),
+      {
+        customKeyName: `${leaveThreadActionTypes.started}:${this.props.threadInfo.id}`,
+      },
     );
   };
 
@@ -143,15 +146,16 @@
   },
 };
 
-const loadingStatusSelector = createLoadingStatusSelector(
-  leaveThreadActionTypes,
-);
-
 const ConnectedThreadSettingsLeaveThread: React.ComponentType<BaseProps> =
   React.memo<BaseProps>(function ConnectedThreadSettingsLeaveThread(
     props: BaseProps,
   ) {
-    const loadingStatus = useSelector(loadingStatusSelector);
+    const loadingStatus = useSelector(state =>
+      createLoadingStatusSelector(
+        leaveThreadActionTypes,
+        `${leaveThreadActionTypes.started}:${props.threadInfo.id}`,
+      )(state),
+    );
     const otherUsersButNoOtherAdminsValue = useSelector(
       otherUsersButNoOtherAdmins(props.threadInfo.id),
     );
diff --git a/native/chat/settings/thread-settings-name.react.js b/native/chat/settings/thread-settings-name.react.js
--- a/native/chat/settings/thread-settings-name.react.js
+++ b/native/chat/settings/thread-settings-name.react.js
@@ -154,7 +154,9 @@
     this.props.dispatchActionPromise(
       changeThreadSettingsActionTypes,
       editNamePromise,
-      { customKeyName: `${changeThreadSettingsActionTypes.started}:name` },
+      {
+        customKeyName: `${changeThreadSettingsActionTypes.started}:${this.props.threadInfo.id}:name`,
+      },
     );
     editNamePromise.then(() => {
       this.props.setNameEditValue(null);
@@ -211,16 +213,16 @@
   },
 };
 
-const loadingStatusSelector = createLoadingStatusSelector(
-  changeThreadSettingsActionTypes,
-  `${changeThreadSettingsActionTypes.started}:name`,
-);
-
 const ConnectedThreadSettingsName: React.ComponentType<BaseProps> =
   React.memo<BaseProps>(function ConnectedThreadSettingsName(props: BaseProps) {
     const styles = useStyles(unboundStyles);
     const colors = useColors();
-    const loadingStatus = useSelector(loadingStatusSelector);
+    const loadingStatus = useSelector(state =>
+      createLoadingStatusSelector(
+        changeThreadSettingsActionTypes,
+        `${changeThreadSettingsActionTypes.started}:${props.threadInfo.id}:name`,
+      )(state),
+    );
 
     const dispatchActionPromise = useDispatchActionPromise();
     const callChangeThreadSettings = useServerCall(changeThreadSettings);
diff --git a/native/chat/settings/thread-settings.react.js b/native/chat/settings/thread-settings.react.js
--- a/native/chat/settings/thread-settings.react.js
+++ b/native/chat/settings/thread-settings.react.js
@@ -1108,34 +1108,10 @@
   },
 };
 
-const editNameLoadingStatusSelector = createLoadingStatusSelector(
-  changeThreadSettingsActionTypes,
-  `${changeThreadSettingsActionTypes.started}:name`,
-);
-const editColorLoadingStatusSelector = createLoadingStatusSelector(
-  changeThreadSettingsActionTypes,
-  `${changeThreadSettingsActionTypes.started}:color`,
-);
-const editDescriptionLoadingStatusSelector = createLoadingStatusSelector(
-  changeThreadSettingsActionTypes,
-  `${changeThreadSettingsActionTypes.started}:description`,
-);
-const leaveThreadLoadingStatusSelector = createLoadingStatusSelector(
-  leaveThreadActionTypes,
-);
-
-const somethingIsSaving = (
+const threadMembersChangeIsSaving = (
   state: AppState,
   threadMembers: $ReadOnlyArray<RelativeMemberInfo>,
 ) => {
-  if (
-    editNameLoadingStatusSelector(state) === 'loading' ||
-    editColorLoadingStatusSelector(state) === 'loading' ||
-    editDescriptionLoadingStatusSelector(state) === 'loading' ||
-    leaveThreadLoadingStatusSelector(state) === 'loading'
-  ) {
-    return true;
-  }
   for (const threadMember of threadMembers) {
     const removeUserLoadingStatus = createLoadingStatusSelector(
       removeUsersFromThreadActionTypes,
@@ -1207,9 +1183,41 @@
     const resolvedChildThreadInfos = useResolvedOptionalThreadInfos(
       boundChildThreadInfos,
     );
-    const boundSomethingIsSaving = useSelector(state =>
-      somethingIsSaving(state, threadMembers),
+
+    const editNameLoadingStatus = useSelector(state =>
+      createLoadingStatusSelector(
+        changeThreadSettingsActionTypes,
+        `${changeThreadSettingsActionTypes.started}:${threadID}:name`,
+      )(state),
+    );
+    const editColorLoadingStatus = useSelector(state =>
+      createLoadingStatusSelector(
+        changeThreadSettingsActionTypes,
+        `${changeThreadSettingsActionTypes.started}:${threadID}:color`,
+      )(state),
+    );
+    const editDescriptionLoadingStatus = useSelector(state =>
+      createLoadingStatusSelector(
+        changeThreadSettingsActionTypes,
+        `${changeThreadSettingsActionTypes.started}:${threadID}:description`,
+      )(state),
+    );
+    const leaveThreadLoadingStatus = useSelector(state =>
+      createLoadingStatusSelector(
+        leaveThreadActionTypes,
+        `${leaveThreadActionTypes.started}:${threadID}`,
+      )(state),
+    );
+
+    const boundThreadMembersChangeIsSaving = useSelector(state =>
+      threadMembersChangeIsSaving(state, threadMembers),
     );
+    const somethingIsSaving =
+      boundThreadMembersChangeIsSaving ||
+      editNameLoadingStatus === 'loading' ||
+      editColorLoadingStatus === 'loading' ||
+      editDescriptionLoadingStatus === 'loading' ||
+      leaveThreadLoadingStatus === 'loading';
 
     const { navigation } = props;
     React.useEffect(() => {
@@ -1217,14 +1225,14 @@
       invariant(tabNavigation, 'ChatNavigator should be within TabNavigator');
 
       const onTabPress = () => {
-        if (navigation.isFocused() && !boundSomethingIsSaving) {
+        if (navigation.isFocused() && !somethingIsSaving) {
           navigation.popToTop();
         }
       };
 
       tabNavigation.addListener('tabPress', onTabPress);
       return () => tabNavigation.removeListener('tabPress', onTabPress);
-    }, [navigation, boundSomethingIsSaving]);
+    }, [navigation, somethingIsSaving]);
 
     const styles = useStyles(unboundStyles);
     const indicatorStyle = useIndicatorStyle();
@@ -1241,7 +1249,7 @@
         threadInfo={resolvedThreadInfo}
         parentThreadInfo={resolvedParentThreadInfo}
         childThreadInfos={resolvedChildThreadInfos}
-        somethingIsSaving={boundSomethingIsSaving}
+        somethingIsSaving={somethingIsSaving}
         styles={styles}
         indicatorStyle={indicatorStyle}
         overlayContext={overlayContext}