diff --git a/src/view/shell/desktop/RightNav.tsx b/src/view/shell/desktop/RightNav.tsx
index 4fae64fef7..02165d3c67 100644
--- a/src/view/shell/desktop/RightNav.tsx
+++ b/src/view/shell/desktop/RightNav.tsx
@@ -158,6 +158,7 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     gap: 8,
     marginHorizontal: 12,
+    marginTop: 8,
   },
   darkModeToggleIcon: {
     flexDirection: 'row',
diff --git a/src/view/shell/index.web.tsx b/src/view/shell/index.web.tsx
index 68ce370edb..5e38752683 100644
--- a/src/view/shell/index.web.tsx
+++ b/src/view/shell/index.web.tsx
@@ -36,7 +36,7 @@ const ShellInner = observer(() => {
           <FlatNavigator />
         </ErrorBoundary>
       </View>
-      {isDesktop && (
+      {isDesktop && store.session.hasSession && (
         <>
           <DesktopLeftNav />
           <DesktopRightNav />