diff --git a/app/mattermost.js b/app/mattermost.js
index 5c3047a77..537dbc1a4 100644
--- a/app/mattermost.js
+++ b/app/mattermost.js
@@ -140,18 +140,16 @@ export function componentDidDisappearListener({componentId}) {
 
     if (componentId === 'MainSidebar') {
         EventEmitter.emit(NavigationTypes.MAIN_SIDEBAR_DID_CLOSE);
-    }
-
-    if (componentId === THREAD) {
-        if (EphemeralStore.hasModalsOpened()) {
-            for (const modal of EphemeralStore.navigationModalStack) {
-                const enableSwipe = {
-                    modal: {
-                        swipeToDismiss: true,
-                    },
-                };
-                Navigation.mergeOptions(modal, enableSwipe);
-            }
+    } else if (componentId === 'SettingsSidebar') {
+        EventEmitter.emit(NavigationTypes.CLOSE_SETTINGS_SIDEBAR);
+    } else if (componentId === THREAD && EphemeralStore.hasModalsOpened()) {
+        for (const modal of EphemeralStore.navigationModalStack) {
+            const enableSwipe = {
+                modal: {
+                    swipeToDismiss: true,
+                },
+            };
+            Navigation.mergeOptions(modal, enableSwipe);
         }
     }
 }
diff --git a/app/store/ephemeral_store.js b/app/store/ephemeral_store.js
index 912ce2e7e..4283340a3 100644
--- a/app/store/ephemeral_store.js
+++ b/app/store/ephemeral_store.js
@@ -41,7 +41,7 @@ class EphemeralStore {
 
     addToNavigationComponentIdStack = (componentId) => {
         const index = this.navigationComponentIdStack.indexOf(componentId);
-        if (index > 0) {
+        if (index >= 0) {
             this.navigationComponentIdStack.slice(index, 1);
         }