diff --git a/src/view/screens/Settings.tsx b/src/view/screens/Settings.tsx
index a79a357b75..dc18add506 100644
--- a/src/view/screens/Settings.tsx
+++ b/src/view/screens/Settings.tsx
@@ -68,6 +68,8 @@ export const SettingsScreen = withAuthRequired(
     }
     const onPressAddAccount = () => {
       track('Settings:AddAccountButtonClicked')
+      navigation.navigate('HomeTab')
+      navigation.dispatch(StackActions.popToTop())
       store.session.clear()
     }
     const onPressChangeHandle = () => {
diff --git a/src/view/shell/index.tsx b/src/view/shell/index.tsx
index 15f9ef58c6..d7877804b9 100644
--- a/src/view/shell/index.tsx
+++ b/src/view/shell/index.tsx
@@ -46,7 +46,7 @@ const ShellInner = observer(() => {
             onOpen={onOpenDrawer}
             onClose={onCloseDrawer}
             swipeEdgeWidth={winDim.width}
-            swipeEnabled={!canGoBack}>
+            swipeEnabled={!canGoBack && store.session.hasSession}>
             <TabsNavigator />
           </Drawer>
         </ErrorBoundary>