diff --git a/src/view/shell/BottomBar.tsx b/src/view/shell/BottomBar.tsx
index 273eb01879..5d9d1c4932 100644
--- a/src/view/shell/BottomBar.tsx
+++ b/src/view/shell/BottomBar.tsx
@@ -69,7 +69,7 @@ export const BottomBar = observer(({navigation}: BottomTabBarProps) => {
       track(`MobileShell:${tab}ButtonPressed`)
       const state = navigation.getState()
       const curr = currentRoute(state).name
-      if (curr === tab || curr === `${tab}Stack`) {
+      if (curr === tab || curr === `${tab}Stack` || curr === `${tab}Inner`) {
         store.emitScreenSoftReset()
       } else if (state.routes[state.index].name === `${tab}Stack`) {
         navigation.dispatch(StackActions.popToTop())
@@ -94,10 +94,14 @@ export const BottomBar = observer(({navigation}: BottomTabBarProps) => {
   }, [navigation, track, store.me.handle])
 
   const curr = currentRoute(navigation.getState()).name
-  const isAtHome = curr === 'HomeStack' || curr === 'Home'
-  const isAtSearch = curr === 'SearchStack' || curr === 'Search'
+  const isAtHome =
+    curr === 'HomeStack' || curr === 'Home' || curr === 'HomeInner'
+  const isAtSearch =
+    curr === 'SearchStack' || curr === 'Search' || curr === 'SearchInner'
   const isAtNotifications =
-    curr === 'NotificationsStack' || curr === 'Notifications'
+    curr === 'NotificationsStack' ||
+    curr === 'Notifications' ||
+    curr === 'NotificationsInner'
 
   return (
     <Animated.View
diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx
index 6eae9a38bc..9c43ab8cae 100644
--- a/src/view/shell/Drawer.tsx
+++ b/src/view/shell/Drawer.tsx
@@ -48,286 +48,283 @@ function currentRoute(state) {
   return node
 }
 
-export const Drawer = observer(
-  ({state, navigation}: DrawerContentComponentProps) => {
-    const theme = useTheme()
-    const pal = usePalette('default')
-    const store = useStores()
-    const {track} = useAnalytics()
-    const isDrawerOpen = useDrawerStatus() === 'open'
+export const Drawer = observer(({navigation}: DrawerContentComponentProps) => {
+  const theme = useTheme()
+  const pal = usePalette('default')
+  const store = useStores()
+  const {track} = useAnalytics()
+  const isDrawerOpen = useDrawerStatus() === 'open'
 
-    // events
-    // =
+  // events
+  // =
 
-    React.useEffect(() => {
-      console.log(
-        'Drawer',
-        isDrawerOpen ? 'minimizing' : 'unminimizing',
-        'shell',
-      )
-      store.shell.setMinimalShellMode(isDrawerOpen)
-    }, [isDrawerOpen, store])
+  React.useEffect(() => {
+    console.log('Drawer', isDrawerOpen ? 'minimizing' : 'unminimizing', 'shell')
+    store.shell.setMinimalShellMode(isDrawerOpen)
+  }, [isDrawerOpen, store])
 
-    const onPressTab = React.useCallback(
-      (tab: string) => {
-        track('Menu:ItemClicked', {url: tab})
-        const state = navigation.getState()
-        const curr = currentRoute(state).name
-        if (curr === tab || curr === `${tab}Stack`) {
-          store.emitScreenSoftReset()
-        } else if (state.routes[state.index].name === `${tab}Stack`) {
-          navigation.dispatch(StackActions.popToTop())
-        } else {
+  const onPressTab = React.useCallback(
+    (tab: string) => {
+      track('Menu:ItemClicked', {url: tab})
+      const state = navigation.getState()
+      navigation.closeDrawer()
+      const curr = currentRoute(state).name
+      if (curr === tab || curr === `${tab}Stack`) {
+        store.emitScreenSoftReset()
+      } else if (state.routes[state.index].name === `${tab}Stack`) {
+        navigation.dispatch(StackActions.popToTop())
+      } else {
+        // wait for drawer anim to finish
+        setTimeout(() => {
           navigation.navigate(`${tab}Stack`)
-        }
-      },
-      [store, track, navigation],
-    )
+        }, 250)
+      }
+    },
+    [store, track, navigation],
+  )
 
-    const onPressHome = React.useCallback(
-      () => onPressTab('Home'),
-      [onPressTab],
-    )
+  const onPressHome = React.useCallback(() => onPressTab('Home'), [onPressTab])
 
-    const onPressSearch = React.useCallback(
-      () => onPressTab('Search'),
-      [onPressTab],
-    )
+  const onPressSearch = React.useCallback(
+    () => onPressTab('Search'),
+    [onPressTab],
+  )
 
-    const onPressNotifications = React.useCallback(
-      () => onPressTab('Notifications'),
-      [onPressTab],
-    )
+  const onPressNotifications = React.useCallback(
+    () => onPressTab('Notifications'),
+    [onPressTab],
+  )
 
-    const onPressProfile = React.useCallback(() => {
-      track('Menu:ItemClicked', {url: 'Profile'})
-      navigation.navigate('Profile', {name: store.me.handle})
-    }, [navigation, track, store.me.handle])
+  const onPressProfile = React.useCallback(() => {
+    track('Menu:ItemClicked', {url: 'Profile'})
+    navigation.navigate('Profile', {name: store.me.handle})
+    navigation.closeDrawer()
+  }, [navigation, track, store.me.handle])
 
-    const onPressSettings = React.useCallback(() => {
-      track('Menu:ItemClicked', {url: 'Settings'})
-      navigation.navigate('Settings')
-    }, [navigation, track])
+  const onPressSettings = React.useCallback(() => {
+    track('Menu:ItemClicked', {url: 'Settings'})
+    navigation.navigate('Settings')
+    navigation.closeDrawer()
+  }, [navigation, track])
 
-    const onPressFeedback = () => {
-      track('Menu:FeedbackClicked')
-      Linking.openURL(FEEDBACK_FORM_URL)
-    }
+  const onPressFeedback = () => {
+    track('Menu:FeedbackClicked')
+    Linking.openURL(FEEDBACK_FORM_URL)
+  }
 
-    // rendering
-    // =
+  // rendering
+  // =
 
-    const MenuItem = ({
-      icon,
-      label,
-      count,
-      bold,
-      onPress,
-    }: {
-      icon: JSX.Element
-      label: string
-      count?: number
-      bold?: boolean
-      onPress: () => void
-    }) => (
-      <TouchableOpacity
-        testID={`menuItemButton-${label}`}
-        style={styles.menuItem}
-        onPress={onPress}>
-        <View style={[styles.menuItemIconWrapper]}>
-          {icon}
-          {count ? (
-            <View style={styles.menuItemCount}>
-              <Text style={styles.menuItemCountLabel}>{count}</Text>
-            </View>
-          ) : undefined}
+  const MenuItem = ({
+    icon,
+    label,
+    count,
+    bold,
+    onPress,
+  }: {
+    icon: JSX.Element
+    label: string
+    count?: number
+    bold?: boolean
+    onPress: () => void
+  }) => (
+    <TouchableOpacity
+      testID={`menuItemButton-${label}`}
+      style={styles.menuItem}
+      onPress={onPress}>
+      <View style={[styles.menuItemIconWrapper]}>
+        {icon}
+        {count ? (
+          <View style={styles.menuItemCount}>
+            <Text style={styles.menuItemCountLabel}>{count}</Text>
+          </View>
+        ) : undefined}
+      </View>
+      <Text
+        type={bold ? '2xl-bold' : '2xl'}
+        style={[pal.text, s.flex1]}
+        numberOfLines={1}>
+        {label}
+      </Text>
+    </TouchableOpacity>
+  )
+
+  const onDarkmodePress = () => {
+    track('Menu:ItemClicked', {url: '/darkmode'})
+    store.shell.setDarkMode(!store.shell.darkMode)
+  }
+
+  const curr = currentRoute(navigation.getState()).name
+  const isAtHome =
+    curr === 'HomeStack' || curr === 'Home' || curr === 'HomeInner'
+  const isAtSearch =
+    curr === 'SearchStack' || curr === 'Search' || curr === 'SearchInner'
+  const isAtNotifications =
+    curr === 'NotificationsStack' ||
+    curr === 'Notifications' ||
+    curr === 'NotificationsInner'
+
+  return (
+    <View
+      testID="menuView"
+      style={[
+        styles.view,
+        theme.colorScheme === 'light' ? pal.view : styles.viewDarkMode,
+      ]}>
+      <SafeAreaView style={s.flex1}>
+        <TouchableOpacity testID="profileCardButton" onPress={onPressProfile}>
+          <UserAvatar
+            size={80}
+            displayName={store.me.displayName}
+            handle={store.me.handle}
+            avatar={store.me.avatar}
+          />
+          <Text
+            type="title-lg"
+            style={[pal.text, s.bold, styles.profileCardDisplayName]}>
+            {store.me.displayName || store.me.handle}
+          </Text>
+          <Text type="2xl" style={[pal.textLight, styles.profileCardHandle]}>
+            @{store.me.handle}
+          </Text>
+          <Text type="xl" style={[pal.textLight, styles.profileCardFollowers]}>
+            <Text type="xl-medium" style={pal.text}>
+              {store.me.followersCount || 0}
+            </Text>{' '}
+            {pluralize(store.me.followersCount || 0, 'follower')} &middot;{' '}
+            <Text type="xl-medium" style={pal.text}>
+              {store.me.followsCount || 0}
+            </Text>{' '}
+            following
+          </Text>
+        </TouchableOpacity>
+        <View style={s.flex1} />
+        <View>
+          <MenuItem
+            icon={
+              isAtSearch ? (
+                <MagnifyingGlassIcon2Solid
+                  style={pal.text as StyleProp<ViewStyle>}
+                  size={24}
+                  strokeWidth={1.7}
+                />
+              ) : (
+                <MagnifyingGlassIcon2
+                  style={pal.text as StyleProp<ViewStyle>}
+                  size={24}
+                  strokeWidth={1.7}
+                />
+              )
+            }
+            label="Search"
+            bold={isAtSearch}
+            onPress={onPressSearch}
+          />
+          <MenuItem
+            icon={
+              isAtHome ? (
+                <HomeIconSolid
+                  style={pal.text as StyleProp<ViewStyle>}
+                  size="24"
+                  strokeWidth={3.25}
+                  fillOpacity={1}
+                />
+              ) : (
+                <HomeIcon
+                  style={pal.text as StyleProp<ViewStyle>}
+                  size="24"
+                  strokeWidth={3.25}
+                />
+              )
+            }
+            label="Home"
+            bold={isAtHome}
+            onPress={onPressHome}
+          />
+          <MenuItem
+            icon={
+              isAtNotifications ? (
+                <BellIconSolid
+                  style={pal.text as StyleProp<ViewStyle>}
+                  size="24"
+                  strokeWidth={1.7}
+                  fillOpacity={1}
+                />
+              ) : (
+                <BellIcon
+                  style={pal.text as StyleProp<ViewStyle>}
+                  size="24"
+                  strokeWidth={1.7}
+                />
+              )
+            }
+            label="Notifications"
+            count={store.me.notifications.unreadCount}
+            bold={isAtNotifications}
+            onPress={onPressNotifications}
+          />
+          <MenuItem
+            icon={
+              <UserIcon
+                style={pal.text as StyleProp<ViewStyle>}
+                size="26"
+                strokeWidth={1.5}
+              />
+            }
+            label="Profile"
+            onPress={onPressProfile}
+          />
+          <MenuItem
+            icon={
+              <CogIcon
+                style={pal.text as StyleProp<ViewStyle>}
+                size="26"
+                strokeWidth={1.75}
+              />
+            }
+            label="Settings"
+            onPress={onPressSettings}
+          />
         </View>
-        <Text
-          type={bold ? '2xl-bold' : '2xl'}
-          style={[pal.text, s.flex1]}
-          numberOfLines={1}>
-          {label}
-        </Text>
-      </TouchableOpacity>
-    )
-
-    const onDarkmodePress = () => {
-      track('Menu:ItemClicked', {url: '/darkmode'})
-      store.shell.setDarkMode(!store.shell.darkMode)
-    }
-
-    const curr = currentRoute(navigation.getState()).name
-    const isAtHome = curr === 'HomeStack' || curr === 'Home'
-    const isAtSearch = curr === 'SearchStack' || curr === 'Search'
-    const isAtNotifications =
-      curr === 'NotificationsStack' || curr === 'Notifications'
-
-    return (
-      <View
-        testID="menuView"
-        style={[
-          styles.view,
-          theme.colorScheme === 'light' ? pal.view : styles.viewDarkMode,
-        ]}>
-        <SafeAreaView style={s.flex1}>
+        <View style={s.flex1} />
+        <View style={styles.footer}>
           <TouchableOpacity
-            testID="profileCardButton"
-            onPress={() => onNavigate(`/profile/${store.me.handle}`)}>
-            <UserAvatar
-              size={80}
-              displayName={store.me.displayName}
-              handle={store.me.handle}
-              avatar={store.me.avatar}
+            onPress={onDarkmodePress}
+            style={[
+              styles.footerBtn,
+              theme.colorScheme === 'light'
+                ? pal.btn
+                : styles.footerBtnDarkMode,
+            ]}>
+            <MoonIcon
+              size={22}
+              style={pal.text as StyleProp<ViewStyle>}
+              strokeWidth={2}
             />
-            <Text
-              type="title-lg"
-              style={[pal.text, s.bold, styles.profileCardDisplayName]}>
-              {store.me.displayName || store.me.handle}
-            </Text>
-            <Text type="2xl" style={[pal.textLight, styles.profileCardHandle]}>
-              @{store.me.handle}
-            </Text>
-            <Text
-              type="xl"
-              style={[pal.textLight, styles.profileCardFollowers]}>
-              <Text type="xl-medium" style={pal.text}>
-                {store.me.followersCount || 0}
-              </Text>{' '}
-              {pluralize(store.me.followersCount || 0, 'follower')} &middot;{' '}
-              <Text type="xl-medium" style={pal.text}>
-                {store.me.followsCount || 0}
-              </Text>{' '}
-              following
+          </TouchableOpacity>
+          <TouchableOpacity
+            onPress={onPressFeedback}
+            style={[
+              styles.footerBtn,
+              styles.footerBtnFeedback,
+              theme.colorScheme === 'light'
+                ? styles.footerBtnFeedbackLight
+                : styles.footerBtnFeedbackDark,
+            ]}>
+            <FontAwesomeIcon
+              style={pal.link as FontAwesomeIconStyle}
+              size={19}
+              icon={['far', 'message']}
+            />
+            <Text type="2xl-medium" style={[pal.link, s.pl10]}>
+              Feedback
             </Text>
           </TouchableOpacity>
-          <View style={s.flex1} />
-          <View>
-            <MenuItem
-              icon={
-                isAtSearch ? (
-                  <MagnifyingGlassIcon2Solid
-                    style={pal.text as StyleProp<ViewStyle>}
-                    size={24}
-                    strokeWidth={1.7}
-                  />
-                ) : (
-                  <MagnifyingGlassIcon2
-                    style={pal.text as StyleProp<ViewStyle>}
-                    size={24}
-                    strokeWidth={1.7}
-                  />
-                )
-              }
-              label="Search"
-              bold={isAtSearch}
-              onPress={onPressSearch}
-            />
-            <MenuItem
-              icon={
-                isAtHome ? (
-                  <HomeIconSolid
-                    style={pal.text as StyleProp<ViewStyle>}
-                    size="24"
-                    strokeWidth={3.25}
-                    fillOpacity={1}
-                  />
-                ) : (
-                  <HomeIcon
-                    style={pal.text as StyleProp<ViewStyle>}
-                    size="24"
-                    strokeWidth={3.25}
-                  />
-                )
-              }
-              label="Home"
-              bold={isAtHome}
-              onPress={onPressHome}
-            />
-            <MenuItem
-              icon={
-                isAtNotifications ? (
-                  <BellIconSolid
-                    style={pal.text as StyleProp<ViewStyle>}
-                    size="24"
-                    strokeWidth={1.7}
-                    fillOpacity={1}
-                  />
-                ) : (
-                  <BellIcon
-                    style={pal.text as StyleProp<ViewStyle>}
-                    size="24"
-                    strokeWidth={1.7}
-                  />
-                )
-              }
-              label="Notifications"
-              count={store.me.notifications.unreadCount}
-              bold={isAtNotifications}
-              onPress={onPressNotifications}
-            />
-            <MenuItem
-              icon={
-                <UserIcon
-                  style={pal.text as StyleProp<ViewStyle>}
-                  size="26"
-                  strokeWidth={1.5}
-                />
-              }
-              label="Profile"
-              onPress={onPressProfile}
-            />
-            <MenuItem
-              icon={
-                <CogIcon
-                  style={pal.text as StyleProp<ViewStyle>}
-                  size="26"
-                  strokeWidth={1.75}
-                />
-              }
-              label="Settings"
-              onPress={onPressSettings}
-            />
-          </View>
-          <View style={s.flex1} />
-          <View style={styles.footer}>
-            <TouchableOpacity
-              onPress={onDarkmodePress}
-              style={[
-                styles.footerBtn,
-                theme.colorScheme === 'light'
-                  ? pal.btn
-                  : styles.footerBtnDarkMode,
-              ]}>
-              <MoonIcon
-                size={22}
-                style={pal.text as StyleProp<ViewStyle>}
-                strokeWidth={2}
-              />
-            </TouchableOpacity>
-            <TouchableOpacity
-              onPress={onPressFeedback}
-              style={[
-                styles.footerBtn,
-                styles.footerBtnFeedback,
-                theme.colorScheme === 'light'
-                  ? styles.footerBtnFeedbackLight
-                  : styles.footerBtnFeedbackDark,
-              ]}>
-              <FontAwesomeIcon
-                style={pal.link as FontAwesomeIconStyle}
-                size={19}
-                icon={['far', 'message']}
-              />
-              <Text type="2xl-medium" style={[pal.link, s.pl10]}>
-                Feedback
-              </Text>
-            </TouchableOpacity>
-          </View>
-        </SafeAreaView>
-      </View>
-    )
-  },
-)
+        </View>
+      </SafeAreaView>
+    </View>
+  )
+})
 
 const styles = StyleSheet.create({
   view: {