diff --git a/app/actions/navigation.js b/app/actions/navigation.js
index d4cd69ad2..5d6828dcb 100644
--- a/app/actions/navigation.js
+++ b/app/actions/navigation.js
@@ -166,11 +166,14 @@ export function goToScreen(name, title, passProps = {}, options = {}) {
     };
 }
 
-export function popTopScreen() {
+export function popTopScreen(screenId) {
     return () => {
-        const componentId = EphemeralStore.getNavigationTopComponentId();
-
-        Navigation.pop(componentId);
+        if (screenId) {
+            Navigation.pop(screenId);
+        } else {
+            const componentId = EphemeralStore.getNavigationTopComponentId();
+            Navigation.pop(componentId);
+        }
     };
 }
 
diff --git a/app/screens/thread/thread_base.js b/app/screens/thread/thread_base.js
index 0b64e7e32..50c733642 100644
--- a/app/screens/thread/thread_base.js
+++ b/app/screens/thread/thread_base.js
@@ -88,7 +88,8 @@ export default class ThreadBase extends PureComponent {
     }
 
     close = () => {
-        this.props.actions.popTopScreen();
+        const {actions, componentId} = this.props;
+        actions.popTopScreen(componentId);
     };
 
     handleAutoComplete = (value) => {