diff --git a/apps/mobile/src/components/LoginDialog/index.js b/apps/mobile/src/components/LoginDialog/index.js
index 54b87427c..74a3b3713 100644
--- a/apps/mobile/src/components/LoginDialog/index.js
+++ b/apps/mobile/src/components/LoginDialog/index.js
@@ -16,9 +16,9 @@ import {createStackNavigator} from '@react-navigation/stack';
 const Stack = createStackNavigator();
 
 const modalNavigatorRef2 = createRef();
-const ModalNavigator = () => {
+const ModalNavigator = ({onStateChange}) => {
   return (
-    <NavigationContainer independent={true} ref={modalNavigatorRef2}>
+    <NavigationContainer onStateChange={onStateChange} independent={true} ref={modalNavigatorRef2}>
       <Stack.Navigator
         initialRouteName="Login"
         screenOptions={{
@@ -127,7 +127,11 @@ class LoginDialog extends React.Component {
               paddingVertical: 16,
               zIndex: 10,
             }}>
-            <ModalNavigator />
+            <ModalNavigator
+              onStateChange={event => {
+                  this.routeIndex = event.index;
+              }}
+            />
           </View>
         </Animatable.View>
       </Modal>
diff --git a/apps/mobile/src/components/MoveNoteDialog/index.js b/apps/mobile/src/components/MoveNoteDialog/index.js
index e0e3f5e10..ec9c2a7e7 100644
--- a/apps/mobile/src/components/MoveNoteDialog/index.js
+++ b/apps/mobile/src/components/MoveNoteDialog/index.js
@@ -14,9 +14,9 @@ import {createStackNavigator} from '@react-navigation/stack';
 
 const Stack = createStackNavigator();
 const modalNavigatorRef = createRef();
-const ModalNavigator = () => {
+const ModalNavigator = ({onStateChange}) => {
   return (
-    <NavigationContainer independent={true} ref={modalNavigatorRef}>
+    <NavigationContainer onStateChange={onStateChange} independent={true} ref={modalNavigatorRef}>
       <Stack.Navigator
         initialRouteName="Folders"
         screenOptions={{
@@ -135,7 +135,11 @@ class MoveNoteDialog extends React.Component {
               padding: DDS.isTab ? 8 : 0,
               zIndex: 10,
             }}>
-            <ModalNavigator />
+            <ModalNavigator
+                onStateChange={event => {
+                  this.routeIndex = event.index;
+              }} 
+            />
           </View>
         </Animatable.View>
       </Modal>