From 3a2a1b0dc8d9e3f65853d19b1436adb4035cd789 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Thu, 25 Dec 2025 01:39:33 -0800
Subject: [PATCH] prevent sidebar item conflict with server selector

---
 .../sidebar/components/collapsed-sidebar.module.css   | 11 ++++++-----
 .../features/sidebar/components/collapsed-sidebar.tsx |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/renderer/features/sidebar/components/collapsed-sidebar.module.css b/src/renderer/features/sidebar/components/collapsed-sidebar.module.css
index 036a8db79..4f4e08d99 100644
--- a/src/renderer/features/sidebar/components/collapsed-sidebar.module.css
+++ b/src/renderer/features/sidebar/components/collapsed-sidebar.module.css
@@ -1,4 +1,5 @@
 .sidebar-container {
+    position: relative;
     display: flex;
     flex-direction: column;
     height: 100%;
@@ -11,15 +12,11 @@
     max-height: calc(100vh - 149px);
 }
 
-.sidebar-container {
-    position: relative;
-}
-
 .server-selector-container {
     position: absolute;
+    right: 0;
     bottom: 0;
     left: 0;
-    right: 0;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -35,3 +32,7 @@
     object-fit: cover;
     border-radius: var(--theme-radius-md);
 }
+
+.scroll-area-with-server {
+    padding-bottom: calc(2rem + 2 * var(--theme-spacing-md));
+}
diff --git a/src/renderer/features/sidebar/components/collapsed-sidebar.tsx b/src/renderer/features/sidebar/components/collapsed-sidebar.tsx
index 5d46a4caf..4ac3debf3 100644
--- a/src/renderer/features/sidebar/components/collapsed-sidebar.tsx
+++ b/src/renderer/features/sidebar/components/collapsed-sidebar.tsx
@@ -80,7 +80,7 @@ export const CollapsedSidebar = () => {
                 [styles.web]: windowBarStyle === Platform.WEB,
             })}
         >
-            <ScrollArea>
+            <ScrollArea className={currentServer ? styles.scrollAreaWithServer : undefined}>
                 {sidebarCollapsedNavigation && (
                     <Group gap={0} grow>
                         <CollapsedSidebarButton onClick={() => navigate(-1)}>