diff --git a/collab-electron/src/main/index.ts b/collab-electron/src/main/index.ts
index 19e7d150..272f3c25 100644
--- a/collab-electron/src/main/index.ts
+++ b/collab-electron/src/main/index.ts
@@ -185,7 +185,7 @@ interface ShortcutEntry {
 const TOGGLE_SHORTCUTS: Record<string, ShortcutEntry[]> = {
   KeyB: [
     { modifier: altCmdOrCtrl, action: "toggle-agent" },
-    { modifier: cmdOrCtrl, action: "sidebar-files" },
+    { modifier: shiftCmdOrCtrl, action: "sidebar-files" },
   ],
   Backslash: [{ modifier: cmdOrCtrl, action: "sidebar-files" }],
   Comma: [{ modifier: cmdOrCtrl, action: "toggle-settings" }],
@@ -377,7 +377,7 @@ function buildAppMenu(): void {
       submenu: [
         {
           label: "Toggle Files",
-          accelerator: "CommandOrControl+B",
+          accelerator: "CommandOrControl+Shift+B",
           registerAccelerator: false,
           click: () => sendShortcut("sidebar-files"),
         },
diff --git a/collab-electron/src/main/pty.ts b/collab-electron/src/main/pty.ts
index f8b86e69..eb6d88c7 100644
--- a/collab-electron/src/main/pty.ts
+++ b/collab-electron/src/main/pty.ts
@@ -485,7 +485,14 @@ export async function createSession(
   cwdHostPath: string;
   cwdGuestPath?: string;
 }> {
-  const resolvedCwd = cwd || os.homedir();
+  let resolvedCwd = cwd || os.homedir();
+  // Fall back to home directory if the requested cwd does not exist
+  // (e.g. a remembered remote/WSL path on a local macOS host).
+  try {
+    fs.accessSync(resolvedCwd);
+  } catch {
+    resolvedCwd = os.homedir();
+  }
   const shell = process.env.SHELL || "/bin/zsh";
   const c = cols || 80;
   const r = rows || 24;
diff --git a/collab-electron/src/windows/shell/index.html b/collab-electron/src/windows/shell/index.html
index 4bde8e42..b3b0f1d3 100644
--- a/collab-electron/src/windows/shell/index.html
+++ b/collab-electron/src/windows/shell/index.html
@@ -15,7 +15,7 @@
 			id="alpha-dismiss" href="#">[<span>DISMISS</span>]</a></span>
 
 	<button type="button" id="nav-toggle" class="panel-toggle" aria-pressed="true" aria-label="Hide Navigator"
-		data-tooltip="Toggle Nav" data-shortcut="Cmd+B"></button>
+		data-tooltip="Toggle Nav" data-shortcut="Shift+Cmd+B"></button>
 
 	<button type="button" id="agent-toggle" class="panel-toggle" aria-pressed="false" aria-label="Show Agent"
 		data-tooltip="Toggle Agent" data-shortcut="Opt+Cmd+B"></button>