diff --git a/apps/frontend/src/renderer/components/github-issues/components/InvestigationDialog.tsx b/apps/frontend/src/renderer/components/github-issues/components/InvestigationDialog.tsx
index 64088297..05b5456a 100644
--- a/apps/frontend/src/renderer/components/github-issues/components/InvestigationDialog.tsx
+++ b/apps/frontend/src/renderer/components/github-issues/components/InvestigationDialog.tsx
@@ -144,7 +144,10 @@ export function InvestigationDialog({
                     {selectedCommentIds.length === comments.length ? 'Deselect All' : 'Select All'}
                   </Button>
                 </div>
-                <ScrollArea className="flex-1 min-h-0 border rounded-md">
+                <ScrollArea
+                  className="flex min-h-0 border rounded-md"
+                  viewportClassName="h-auto"
+                >
                   <div className="p-2 space-y-2">
                     {comments.map((comment) => (
                       <div
diff --git a/apps/frontend/src/renderer/components/gitlab-issues/components/InvestigationDialog.tsx b/apps/frontend/src/renderer/components/gitlab-issues/components/InvestigationDialog.tsx
index 4910547c..534d37a4 100644
--- a/apps/frontend/src/renderer/components/gitlab-issues/components/InvestigationDialog.tsx
+++ b/apps/frontend/src/renderer/components/gitlab-issues/components/InvestigationDialog.tsx
@@ -141,7 +141,10 @@ export function InvestigationDialog({
                     {selectedNoteIds.length === notes.length ? t('investigation.deselectAll') : t('investigation.selectAll')}
                   </Button>
                 </div>
-                <ScrollArea className="flex-1 min-h-0 border rounded-md">
+                <ScrollArea
+                  className="flex min-h-0 border rounded-md"
+                  viewportClassName="h-auto"
+                >
                   <div className="p-2 space-y-2">
                     {notes.map((note) => (
                       <button
diff --git a/apps/frontend/src/renderer/components/ui/scroll-area.tsx b/apps/frontend/src/renderer/components/ui/scroll-area.tsx
index 5eaf1be9..2ca201e7 100644
--- a/apps/frontend/src/renderer/components/ui/scroll-area.tsx
+++ b/apps/frontend/src/renderer/components/ui/scroll-area.tsx
@@ -4,14 +4,18 @@ import { cn } from '../../lib/utils';
 
 const ScrollArea = React.forwardRef<
   React.ElementRef<typeof ScrollAreaPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root>
->(({ className, children, ...props }, ref) => (
+  React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root> & {
+  viewportClassName?: string;
+}
+>(({ className, children, viewportClassName, ...props }, ref) => (
   <ScrollAreaPrimitive.Root
     ref={ref}
     className={cn('relative overflow-hidden', className)}
     {...props}
   >
-    <ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]">
+    <ScrollAreaPrimitive.Viewport
+      className={cn('h-full w-full rounded-[inherit]', viewportClassName)}
+    >
       {children}
     </ScrollAreaPrimitive.Viewport>
     <ScrollBar />