diff --git a/frontend/src/components/heaps/HeapsPanel.tsx b/frontend/src/components/heaps/HeapsPanel.tsx
index 4cf0bf0..75fd9cb 100644
--- a/frontend/src/components/heaps/HeapsPanel.tsx
+++ b/frontend/src/components/heaps/HeapsPanel.tsx
@@ -338,17 +338,13 @@ export function HeapsPanel() {
                   </span>
                 )}
 
-                {/* Right-aligned cluster. Active indicator + count are
-                 *  always visible; set-active and kebab appear on hover
-                 *  to the RIGHT of the count, displacing it slightly so
-                 *  the count column lines up with the rest of the
-                 *  sidebar in the resting state. */}
-                {isActive && (
-                  <Target
-                    className="h-3 w-3 flex-shrink-0 text-primary"
-                    aria-label="Active heap (T target)"
-                  />
-                )}
+                {/* Right cluster. Count is the rightmost element in the
+                 *  resting state — set-active and kebab use display:none
+                 *  (not invisible) so they reserve no width until hover,
+                 *  keeping the count column aligned with the rest of the
+                 *  sidebar. The active heap is signaled by font-semibold
+                 *  on the name above; the standalone Target indicator
+                 *  was making heap counts sit left of the others. */}
                 {heap.photo_count > 0 ? (
                   <span className="flex h-5 min-w-[24px] flex-shrink-0 items-center justify-center rounded bg-surface-offset px-1.5 text-xs tabular-nums text-text-muted">
                     {heap.photo_count}
@@ -362,7 +358,7 @@ export function HeapsPanel() {
                       e.stopPropagation()
                       setActiveMutation.mutate(heap.id)
                     }}
-                    className="invisible flex-shrink-0 rounded p-0.5 text-text-muted hover:bg-surface-offset hover:text-text group-hover:visible"
+                    className="hidden flex-shrink-0 rounded p-0.5 text-text-muted hover:bg-surface-offset hover:text-text group-hover:block"
                     title="Set as active heap (T target)"
                     aria-label="Set as active heap"
                   >
@@ -372,16 +368,18 @@ export function HeapsPanel() {
 
                 {/* Kebab menu — collects rename / duplicate / convert /
                  *  delete so the row stays compact. */}
-                <div className="relative flex-shrink-0">
+                <div
+                  className={clsx(
+                    'relative flex-shrink-0',
+                    isMenuOpen ? 'block' : 'hidden group-hover:block'
+                  )}
+                >
                   <button
                     onClick={(e) => {
                       e.stopPropagation()
                       setOpenMenuId(isMenuOpen ? null : heap.id)
                     }}
-                    className={clsx(
-                      'rounded p-0.5 text-text-muted hover:bg-surface-offset hover:text-text',
-                      isMenuOpen ? 'visible' : 'invisible group-hover:visible'
-                    )}
+                    className="rounded p-0.5 text-text-muted hover:bg-surface-offset hover:text-text"
                     title="More actions"
                     aria-label="More heap actions"
                     aria-haspopup="menu"
diff --git a/frontend/src/components/layout/LeftSidebar.tsx b/frontend/src/components/layout/LeftSidebar.tsx
index 7987d2e..358b5c4 100644
--- a/frontend/src/components/layout/LeftSidebar.tsx
+++ b/frontend/src/components/layout/LeftSidebar.tsx
@@ -537,24 +537,28 @@ export function LeftSidebar() {
             <span className="h-5 min-w-[24px] flex-shrink-0" aria-hidden="true" />
           )}
 
-          {/* Folder kebab menu — only on folder rows. Hidden until hover
-           *  (or when its menu is open) so the count column stays aligned
-           *  in the resting state. */}
+          {/* Folder kebab menu — only on folder rows. Hidden (display:none)
+           *  until hover so it reserves NO width in the resting state and
+           *  the count column stays aligned across folder + non-folder
+           *  rows. On hover it appears to the right, pushing the count
+           *  left to make room. */}
           {item.id.startsWith('folder-') &&
             (() => {
               const folderId = item.id.slice('folder-'.length)
               const isMenuOpen = openMenuId === item.id
               return (
-                <div className="relative flex-shrink-0">
+                <div
+                  className={clsx(
+                    'relative flex-shrink-0',
+                    isMenuOpen ? 'block' : 'hidden group-hover:block'
+                  )}
+                >
                   <button
                     onClick={(e) => {
                       e.stopPropagation()
                       setOpenMenuId(isMenuOpen ? null : item.id)
                     }}
-                    className={clsx(
-                      'rounded p-0.5 text-text-muted hover:bg-surface-offset hover:text-text',
-                      isMenuOpen ? 'visible' : 'invisible group-hover:visible'
-                    )}
+                    className="rounded p-0.5 text-text-muted hover:bg-surface-offset hover:text-text"
                     title="More actions"
                     aria-label="More folder actions"
                     aria-haspopup="menu"