diff --git a/src/renderer/features/sidebar/components/sidebar.module.css b/src/renderer/features/sidebar/components/sidebar.module.css
index 4f3b0f8da..392bf37c5 100644
--- a/src/renderer/features/sidebar/components/sidebar.module.css
+++ b/src/renderer/features/sidebar/components/sidebar.module.css
@@ -79,3 +79,9 @@
 .accordion-content:last-child {
     padding-bottom: var(--theme-spacing-md);
 }
+
+.server-selector-wrapper {
+    position: relative;
+    z-index: 1;
+    flex-shrink: 0;
+}
diff --git a/src/renderer/features/sidebar/components/sidebar.tsx b/src/renderer/features/sidebar/components/sidebar.tsx
index 728a56ac4..6b485bc0a 100644
--- a/src/renderer/features/sidebar/components/sidebar.tsx
+++ b/src/renderer/features/sidebar/components/sidebar.tsx
@@ -163,9 +163,9 @@ export const Sidebar = () => {
                     )}
                 </Accordion>
             </ScrollArea>
-            <div style={{ flexShrink: 0, position: 'relative', zIndex: 1 }}>
+            <motion.div className={styles.serverSelectorWrapper} layout>
                 <ServerSelector showImage={showImage} />
-            </div>
+            </motion.div>
             <AnimatePresence initial={false} mode="popLayout">
                 {showImage && (
                     <motion.div