From c6ea3851868aee2f2eb59a4b1c12718624e7b593 Mon Sep 17 00:00:00 2001
From: Wes <wesbillman@users.noreply.github.com>
Date: Sun, 16 Aug 2026 11:35:02 -0600
Subject: [PATCH] fix(desktop): skip deferred navigation for selected channel

Avoid replacing an already-selected channel with a navigation skeleton when its
sidebar item is clicked again.

Co-authored-by: Carl <c7ebe626f000404285d3686e1dc74cc07cc60a9754a150041ba132e14bd3e2ec@buzz.block.builderlab.xyz>
Signed-off-by: Wes <wesbillman@users.noreply.github.com>
---
 desktop/src/app/navigation/useDeferredSidebarNavigation.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/desktop/src/app/navigation/useDeferredSidebarNavigation.ts b/desktop/src/app/navigation/useDeferredSidebarNavigation.ts
index 6a7a7a279..d9e67e186 100644
--- a/desktop/src/app/navigation/useDeferredSidebarNavigation.ts
+++ b/desktop/src/app/navigation/useDeferredSidebarNavigation.ts
@@ -77,6 +77,10 @@ export function useDeferredSidebarNavigation({
 
   const selectDeferred = React.useCallback(
     (channelId: string) => {
+      if (channelId === selectedChannelId) {
+        selectChannel(channelId);
+        return;
+      }
       dispatchNavigationIntent();
       cancel();
       const generation = generationRef.current;
@@ -118,7 +122,7 @@ export function useDeferredSidebarNavigation({
         });
       });
     },
-    [cancel, selectChannel],
+    [cancel, selectChannel, selectedChannelId],
   );
 
   return { pendingChannelId, selectDeferred };