diff --git a/src/renderer/features/sidebar/components/collapsed-sidebar.tsx b/src/renderer/features/sidebar/components/collapsed-sidebar.tsx
index 20859e125..1d9ab597d 100644
--- a/src/renderer/features/sidebar/components/collapsed-sidebar.tsx
+++ b/src/renderer/features/sidebar/components/collapsed-sidebar.tsx
@@ -147,7 +147,9 @@ export const CollapsedSidebar = () => {
                             />
                         </DropdownMenu.Target>
                         <DropdownMenu.Dropdown>
-                            <ServerSelectorItems />
+                            <ScrollArea style={{ maxHeight: '95vh' }}>
+                                <ServerSelectorItems />
+                            </ScrollArea>
                         </DropdownMenu.Dropdown>
                     </DropdownMenu>
                 )}
diff --git a/src/renderer/features/sidebar/components/server-selector.tsx b/src/renderer/features/sidebar/components/server-selector.tsx
index 8b8202ffb..ab8743518 100644
--- a/src/renderer/features/sidebar/components/server-selector.tsx
+++ b/src/renderer/features/sidebar/components/server-selector.tsx
@@ -16,6 +16,7 @@ import { Box } from '/@/shared/components/box/box';
 import { DropdownMenu } from '/@/shared/components/dropdown-menu/dropdown-menu';
 import { Group } from '/@/shared/components/group/group';
 import { Icon } from '/@/shared/components/icon/icon';
+import { ScrollArea } from '/@/shared/components/scroll-area/scroll-area';
 import { Stack } from '/@/shared/components/stack/stack';
 import { Text } from '/@/shared/components/text/text';
 import { ServerType } from '/@/shared/types/domain-types';
@@ -94,7 +95,9 @@ export const ServerSelector = () => {
                 </div>
             </DropdownMenu.Target>
             <DropdownMenu.Dropdown style={{ width: `${widthOfTarget}px` }}>
-                <ServerSelectorItems />
+                <ScrollArea style={{ maxHeight: 'calc(100vh - 200px)' }}>
+                    <ServerSelectorItems />
+                </ScrollArea>
             </DropdownMenu.Dropdown>
         </DropdownMenu>
     );