diff --git a/src/components/shared/ImageLightbox.tsx b/src/components/shared/ImageLightbox.tsx
index 9c7589d..cc072e8 100644
--- a/src/components/shared/ImageLightbox.tsx
+++ b/src/components/shared/ImageLightbox.tsx
@@ -12,7 +12,10 @@ export function ImageLightbox({ images, index, onClose, onNavigate }: ImageLight
   const hasNext = index < images.length - 1;
 
   const handleKeyDown = useCallback((e: KeyboardEvent) => {
-    if (e.key === "Escape") onClose();
+    if (e.key === "Escape") {
+      e.stopImmediatePropagation();
+      onClose();
+    }
     if (e.key === "ArrowLeft" && hasPrev) onNavigate(index - 1);
     if (e.key === "ArrowRight" && hasNext) onNavigate(index + 1);
   }, [onClose, onNavigate, index, hasPrev, hasNext]);
diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx
index 680abbb..bc7216f 100644
--- a/src/components/sidebar/Sidebar.tsx
+++ b/src/components/sidebar/Sidebar.tsx
@@ -120,8 +120,12 @@ export function Sidebar() {
         })}
       </nav>
 
-      {/* Account switcher (full) — expanded only */}
-      {!c && <AccountSwitcher />}
+      {/* Account switcher (full) — expanded only, always visible at bottom */}
+      {!c && (
+        <div className="shrink-0">
+          <AccountSwitcher />
+        </div>
+      )}
 
     </aside>
   );
diff --git a/src/lib/notifications.ts b/src/lib/notifications.ts
index 36b6149..d81a23b 100644
--- a/src/lib/notifications.ts
+++ b/src/lib/notifications.ts
@@ -43,7 +43,7 @@ export async function notifyMention(authorName: string, preview: string): Promis
   if (!(await ensurePermission())) return;
   sendNotification({
     title: `${authorName} mentioned you`,
-    body: preview.slice(0, 120),
+    body: preview.slice(0, 120) || "New mention",
   });
 }