diff --git a/dashboard/src/features/entity-table/components/sidebar-entity-popover.tsx b/dashboard/src/features/entity-table/components/sidebar-entity-popover.tsx
index ff72b99..14733b0 100644
--- a/dashboard/src/features/entity-table/components/sidebar-entity-popover.tsx
+++ b/dashboard/src/features/entity-table/components/sidebar-entity-popover.tsx
@@ -25,7 +25,7 @@ export const SidebarEntityTablePopover: FC<SidebarEntityTablePopoverProps> = ({
                 {buttonChild}
             </Button>
         </PopoverTrigger>
-        <PopoverContent className="w-80 max-h-100 p-0">
+        <PopoverContent className="w-80 p-0">
             <SidebarEntitySelection />
         </PopoverContent>
     </Popover>
diff --git a/dashboard/src/features/entity-table/components/sidebar-entity-selection.tsx b/dashboard/src/features/entity-table/components/sidebar-entity-selection.tsx
index 3796791..2cf83fb 100644
--- a/dashboard/src/features/entity-table/components/sidebar-entity-selection.tsx
+++ b/dashboard/src/features/entity-table/components/sidebar-entity-selection.tsx
@@ -3,6 +3,7 @@ import {
     Table, TableHeader, TableRow, TableBody, TableHead,
     ScrollArea, Button,
 } from "@marzneshin/components";
+import { useScreenBreakpoint } from "@marzneshin/hooks";
 import { cn } from "@marzneshin/utils";
 import {
     SidebarEntityCard,
@@ -21,8 +22,9 @@ export const SidebarEntitySelection = () => {
         sidebarCardProps,
     } = useSidebarEntityTableContext()
     const { table } = useEntityTableContext()
+    const isDesktop = useScreenBreakpoint("md");
 
-    const scrollBarHeight = table.getState().pagination.pageSize <= 10 ? "max-h-[45rem]" : "max-h-full"
+    const scrollBarHeight = (table.getState().pagination.pageSize <= 10 && isDesktop) ? "max-h-[45rem]" : "max-h-[20rem]"
     const { t } = useTranslation();
 
     return (