diff --git a/apps/web/src/components/Sidebar.test.ts b/apps/web/src/components/Sidebar.test.ts
index 97386137..e6eb1e7c 100644
--- a/apps/web/src/components/Sidebar.test.ts
+++ b/apps/web/src/components/Sidebar.test.ts
@@ -10,4 +10,12 @@ describe("Sidebar file tree shortcut", () => {
     expect(src).toContain('useRightPanelStore.getState().open("workspace")');
     expect(src).not.toContain("<WorkspaceFileTree");
   });
+
+  it("uses the project context menu for renaming instead of double click", () => {
+    const src = readFileSync(resolve(import.meta.dirname, "./Sidebar.tsx"), "utf8");
+
+    expect(src).toContain('{ id: "rename", label: "Rename project" }');
+    expect(src).toContain("onContextMenu={(event) => {");
+    expect(src).not.toContain("onDoubleClick={(e) => {");
+  });
 });
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index 85af274f..be6cd32a 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -1343,13 +1343,6 @@ export default function Sidebar() {
                       ? { color: isDark ? pColor.textDark : pColor.text }
                       : undefined
                   }
-                  onDoubleClick={(e) => {
-                    e.stopPropagation();
-                    startProjectEditing({
-                      projectId: project.id,
-                      title: project.name,
-                    });
-                  }}
                 >
                   {project.name}
                 </span>
diff --git a/apps/web/src/components/chat/ErrorNotificationBar.tsx b/apps/web/src/components/chat/ErrorNotificationBar.tsx
index 79ce25dd..6577f7ff 100644
--- a/apps/web/src/components/chat/ErrorNotificationBar.tsx
+++ b/apps/web/src/components/chat/ErrorNotificationBar.tsx
@@ -118,7 +118,7 @@ export const ErrorNotificationBar = memo(function ErrorNotificationBar({
           technicalDetails: presentation.technicalDetails,
           severity: "error",
           dismissible: !!onDismissThreadError,
-          onDismiss: onDismissThreadError,
+          ...(onDismissThreadError ? { onDismiss: onDismissThreadError } : {}),
         });
       }
     }
@@ -167,15 +167,12 @@ export const ErrorNotificationBar = memo(function ErrorNotificationBar({
 
   const visibleNotifications = notifications.filter((n) => !dismissedIds.has(n.id));
 
-  const handleDismiss = useCallback(
-    (notif: NotificationItem) => {
-      if (notif.onDismiss) {
-        notif.onDismiss();
-      }
-      setDismissedIds((prev) => new Set(prev).add(notif.id));
-    },
-    [],
-  );
+  const handleDismiss = useCallback((notif: NotificationItem) => {
+    if (notif.onDismiss) {
+      notif.onDismiss();
+    }
+    setDismissedIds((prev) => new Set(prev).add(notif.id));
+  }, []);
 
   const handleDismissAll = useCallback(() => {
     for (const notif of visibleNotifications) {
@@ -207,14 +204,11 @@ export const ErrorNotificationBar = memo(function ErrorNotificationBar({
   } as const;
 
   // Find the highest severity across all notifications
-  const highestSeverity = visibleNotifications.reduce<"error" | "warning" | "info">(
-    (acc, n) => {
-      if (acc === "error" || n.severity === "error") return "error";
-      if (acc === "warning" || n.severity === "warning") return "warning";
-      return "info";
-    },
-    "info",
-  );
+  const highestSeverity = visibleNotifications.reduce<"error" | "warning" | "info">((acc, n) => {
+    if (acc === "error" || n.severity === "error") return "error";
+    if (acc === "warning" || n.severity === "warning") return "warning";
+    return "info";
+  }, "info");
 
   return (
     <div className="mx-auto w-full max-w-7xl px-3 pt-2 sm:px-5">
@@ -290,13 +284,8 @@ export const ErrorNotificationBar = memo(function ErrorNotificationBar({
             {visibleNotifications.map((notif) => {
               const Icon = notif.icon;
               return (
-                <div
-                  key={notif.id}
-                  className="flex items-start gap-2 py-1.5 text-xs"
-                >
-                  <Icon
-                    className={cn("mt-0.5 size-3 shrink-0", severityColor[notif.severity])}
-                  />
+                <div key={notif.id} className="flex items-start gap-2 py-1.5 text-xs">
+                  <Icon className={cn("mt-0.5 size-3 shrink-0", severityColor[notif.severity])} />
                   <div className="min-w-0 flex-1">
                     <p className="font-medium text-foreground/90">{notif.title}</p>
                     <p className="text-muted-foreground">{notif.description}</p>