From 42bd8d34d946cff752f14722b18bb8db6bedf121 Mon Sep 17 00:00:00 2001
From: Kendall Garner <17521368+kgarner7@users.noreply.github.com>
Date: Mon, 29 Jun 2026 21:06:32 -0700
Subject: [PATCH] fix(sidebar): only re-expand sidebar when enabled

---
 .../features/now-playing/routes/now-playing-route.tsx  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/renderer/features/now-playing/routes/now-playing-route.tsx b/src/renderer/features/now-playing/routes/now-playing-route.tsx
index e3acd92b4..b74e79787 100644
--- a/src/renderer/features/now-playing/routes/now-playing-route.tsx
+++ b/src/renderer/features/now-playing/routes/now-playing-route.tsx
@@ -6,7 +6,7 @@ import { PlayQueue } from '/@/renderer/features/now-playing/components/play-queu
 import { PlayQueueListControls } from '/@/renderer/features/now-playing/components/play-queue-list-controls';
 import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page';
 import { PageErrorBoundary } from '/@/renderer/features/shared/components/page-error-boundary';
-import { useAppStoreActions } from '/@/renderer/store';
+import { useAppStore, useAppStoreActions } from '/@/renderer/store';
 import { ItemListKey } from '/@/shared/types/types';
 
 const NowPlayingRoute = () => {
@@ -15,12 +15,16 @@ const NowPlayingRoute = () => {
     const tableRef = useRef<ItemListHandle | null>(null);
 
     useEffect(() => {
+        const wasExpanded = useAppStore.getState().sidebar.rightExpanded;
+
         // On page enter, set rightExpanded to false
         setSideBar({ rightExpanded: false });
 
         return () => {
-            // On page exit, set rightExpanded to true
-            setSideBar({ rightExpanded: true });
+            if (wasExpanded) {
+                // On page exit, set rightExpanded to true if it was previously expanded
+                setSideBar({ rightExpanded: true });
+            }
         };
     }, [setSideBar]);