diff --git a/app/app.tsx b/app/app.tsx
index 83c21da768..fa0198a9dd 100644
--- a/app/app.tsx
+++ b/app/app.tsx
@@ -52,8 +52,8 @@ export const App = () => (
         <GaloyClient>
           <GaloyThemeProvider>
             <FeatureFlagContextProvider>
-              <ErrorBoundary FallbackComponent={ErrorScreen}>
-                <NavigationContainerWrapper>
+              <NavigationContainerWrapper>
+                <ErrorBoundary FallbackComponent={ErrorScreen}>
                   <RootSiblingParent>
                     <NotificationsProvider>
                       <AppStateWrapper />
@@ -63,8 +63,8 @@ export const App = () => (
                     </NotificationsProvider>
                     <GaloyToast />
                   </RootSiblingParent>
-                </NavigationContainerWrapper>
-              </ErrorBoundary>
+                </ErrorBoundary>
+              </NavigationContainerWrapper>
             </FeatureFlagContextProvider>
           </GaloyThemeProvider>
         </GaloyClient>
diff --git a/app/components/contact-modal/contact-modal.tsx b/app/components/contact-modal/contact-modal.tsx
index 14826c7396..e2ce0a5977 100644
--- a/app/components/contact-modal/contact-modal.tsx
+++ b/app/components/contact-modal/contact-modal.tsx
@@ -48,7 +48,7 @@ const ContactModal: React.FC<Props> = ({
     theme: { colors },
   } = useTheme()
 
-  const { navigate } = useNavigation<StackNavigationProp<RootStackParamList>>()
+  const navigation = useNavigation<StackNavigationProp<RootStackParamList>>()
 
   const contactOptionList = [
     {
@@ -56,7 +56,7 @@ const ContactModal: React.FC<Props> = ({
       name: LL.support.chatbot(),
       icon: <Icon name={"chatbubbles-outline"} type="ionicon" />,
       action: () => {
-        navigate("chatbot")
+        navigation.navigate("chatbot")
         toggleModal()
       },
     },