diff --git a/packages/app/src/components/project-picker-modal.tsx b/packages/app/src/components/project-picker-modal.tsx
index 5554beb63..a0141e333 100644
--- a/packages/app/src/components/project-picker-modal.tsx
+++ b/packages/app/src/components/project-picker-modal.tsx
@@ -13,6 +13,7 @@ import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useQuery } from "@tanstack/react-query";
 import { router, usePathname } from "expo-router";
 import { useKeyboardShortcutsStore } from "@/stores/keyboard-shortcuts-store";
+import { shortenPath } from "@/utils/shorten-path";
 import {
   normalizeWorkspaceDescriptor,
   useSessionStore,
@@ -294,7 +295,7 @@ export function ProjectPickerModal() {
                           ]}
                           numberOfLines={1}
                         >
-                          {path}
+                          {shortenPath(path)}
                         </Text>
                       </View>
                     </Pressable>
diff --git a/packages/app/src/components/sidebar-workspace-list.tsx b/packages/app/src/components/sidebar-workspace-list.tsx
index 8cb6d9c46..2d2b12d5d 100644
--- a/packages/app/src/components/sidebar-workspace-list.tsx
+++ b/packages/app/src/components/sidebar-workspace-list.tsx
@@ -1361,6 +1361,7 @@ export function SidebarWorkspaceList({
       if (!serverId || project.projectKind !== 'git') {
         return
       }
+      onWorkspacePress?.()
       router.push(
         buildHostNewAgentRoute(serverId, {
           workingDir: project.iconWorkingDir,
@@ -1368,7 +1369,7 @@ export function SidebarWorkspaceList({
         }) as any
       )
     },
-    [serverId]
+    [serverId, onWorkspacePress]
   )
 
   const renderProject = useCallback(