diff --git a/src/app/api/sidebar/group-order/route.ts b/src/app/api/sidebar/group-order/route.ts
index 43097603..31e48b71 100644
--- a/src/app/api/sidebar/group-order/route.ts
+++ b/src/app/api/sidebar/group-order/route.ts
@@ -3,6 +3,9 @@
  * PUT /api/sidebar/group-order  — save repository group order
  */
 
+// Disable static caching so GET always reads from DB and PUT is never 405-blocked
+export const dynamic = 'force-dynamic';
+
 import { NextResponse } from 'next/server';
 import { getDbInstance } from '@/lib/db/db-instance';
 import { getSidebarGroupOrder, setSidebarGroupOrder } from '@/lib/db/app-settings-db';
diff --git a/src/components/sidebar/BranchListItem.tsx b/src/components/sidebar/BranchListItem.tsx
index 75924fe2..fe7d9959 100644
--- a/src/components/sidebar/BranchListItem.tsx
+++ b/src/components/sidebar/BranchListItem.tsx
@@ -96,7 +96,7 @@ function BranchTooltip({
         fixed z-[9999]
         px-3 py-2 rounded-md shadow-lg
         bg-gray-950 text-xs text-gray-200 border border-gray-700
-        whitespace-nowrap pointer-events-none
+        pointer-events-none max-w-sm
         transition-opacity duration-150
       "
       style={{
@@ -105,11 +105,16 @@ function BranchTooltip({
         opacity: isVisible ? 1 : 0,
       }}
     >
-      <p className="font-medium text-white">{branch.name}</p>
-      <p className="text-gray-400">{branch.repositoryName}</p>
-      <p className="text-gray-400">Status: {branch.status}</p>
+      <p className="font-medium text-white whitespace-nowrap">{branch.name}</p>
+      <p className="text-gray-400 whitespace-nowrap">{branch.repositoryName}</p>
+      <p className="text-gray-400 whitespace-nowrap">Status: {branch.status}</p>
       {branch.worktreePath && (
-        <p className="text-gray-500 truncate max-w-xs">{branch.worktreePath}</p>
+        <p className="text-gray-500 truncate">{branch.worktreePath}</p>
+      )}
+      {branch.description && (
+        <p className="text-gray-300 mt-1 border-t border-gray-700 pt-1 whitespace-pre-wrap break-words">
+          {branch.description}
+        </p>
       )}
     </div>,
     document.body