diff --git a/frontend/src/components/dialogs/tasks/GitHubCommentsDialog.tsx b/frontend/src/components/dialogs/tasks/GitHubCommentsDialog.tsx
index 9863b62f..567842f7 100644
--- a/frontend/src/components/dialogs/tasks/GitHubCommentsDialog.tsx
+++ b/frontend/src/components/dialogs/tasks/GitHubCommentsDialog.tsx
@@ -87,9 +87,13 @@ const GitHubCommentsDialogImpl = NiceModal.create<GitHubCommentsDialogProps>(
     const errorMessage = isError ? getErrorMessage(error) : null;
 
     return (
-      <Dialog open={modal.visible} onOpenChange={handleOpenChange}>
+      <Dialog
+        open={modal.visible}
+        onOpenChange={handleOpenChange}
+        className="max-w-2xl p-0 overflow-hidden"
+      >
         <DialogContent
-          className="max-w-2xl p-0 flex flex-col max-h-[80vh]"
+          className="p-0"
           onKeyDownCapture={(e) => {
             if (e.key === 'Escape') {
               e.stopPropagation();
@@ -98,92 +102,97 @@ const GitHubCommentsDialogImpl = NiceModal.create<GitHubCommentsDialogProps>(
             }
           }}
         >
-          <DialogHeader className="px-4 py-3 border-b flex-shrink-0">
+          <DialogHeader className="px-4 py-3 border-b">
             <DialogTitle className="flex items-center gap-2">
               <MessageSquare className="h-5 w-5" />
               {t('tasks:githubComments.dialog.title')}
             </DialogTitle>
           </DialogHeader>
 
-          <div className="p-4 overflow-auto flex-1">
-            {errorMessage ? (
-              <Alert variant="destructive">
-                <AlertCircle className="h-4 w-4" />
-                <AlertDescription>{errorMessage}</AlertDescription>
-              </Alert>
-            ) : isLoading ? (
-              <div className="flex items-center justify-center py-8">
-                <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
-              </div>
-            ) : comments.length === 0 ? (
-              <p className="text-center text-muted-foreground py-8">
-                {t('tasks:githubComments.dialog.noComments')}
-              </p>
-            ) : (
-              <>
-                <div className="flex items-center justify-between mb-3">
-                  <span className="text-sm text-muted-foreground">
-                    {t('tasks:githubComments.dialog.selectedCount', {
-                      selected: selectedIds.size,
-                      total: comments.length,
+          <div className="max-h-[70vh] flex flex-col min-h-0">
+            <div className="p-4 overflow-auto flex-1 min-h-0">
+              {errorMessage ? (
+                <Alert variant="destructive">
+                  <AlertCircle className="h-4 w-4" />
+                  <AlertDescription>{errorMessage}</AlertDescription>
+                </Alert>
+              ) : isLoading ? (
+                <div className="flex items-center justify-center py-8">
+                  <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
+                </div>
+              ) : comments.length === 0 ? (
+                <p className="text-center text-muted-foreground py-8">
+                  {t('tasks:githubComments.dialog.noComments')}
+                </p>
+              ) : (
+                <>
+                  <div className="flex items-center justify-between mb-3">
+                    <span className="text-sm text-muted-foreground">
+                      {t('tasks:githubComments.dialog.selectedCount', {
+                        selected: selectedIds.size,
+                        total: comments.length,
+                      })}
+                    </span>
+                    <Button
+                      variant="ghost"
+                      size="sm"
+                      onClick={isAllSelected ? deselectAll : selectAll}
+                    >
+                      {isAllSelected
+                        ? t('tasks:githubComments.dialog.deselectAll')
+                        : t('tasks:githubComments.dialog.selectAll')}
+                    </Button>
+                  </div>
+                  <div className="space-y-3">
+                    {comments.map((comment) => {
+                      const id = getCommentId(comment);
+                      return (
+                        <div
+                          key={id}
+                          className="flex items-start gap-3 min-w-0"
+                        >
+                          <Checkbox
+                            checked={selectedIds.has(id)}
+                            onCheckedChange={() => toggleSelection(id)}
+                            className="mt-3"
+                          />
+                          <GitHubCommentCard
+                            author={comment.author}
+                            body={comment.body}
+                            createdAt={comment.created_at}
+                            url={comment.url}
+                            commentType={comment.comment_type}
+                            path={
+                              comment.comment_type === 'review'
+                                ? comment.path
+                                : undefined
+                            }
+                            line={
+                              comment.comment_type === 'review' &&
+                              comment.line != null
+                                ? Number(comment.line)
+                                : undefined
+                            }
+                            diffHunk={
+                              comment.comment_type === 'review'
+                                ? comment.diff_hunk
+                                : undefined
+                            }
+                            variant="list"
+                            onClick={() => toggleSelection(id)}
+                            className="flex-1 min-w-0"
+                          />
+                        </div>
+                      );
                     })}
-                  </span>
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    onClick={isAllSelected ? deselectAll : selectAll}
-                  >
-                    {isAllSelected
-                      ? t('tasks:githubComments.dialog.deselectAll')
-                      : t('tasks:githubComments.dialog.selectAll')}
-                  </Button>
-                </div>
-                <div className="space-y-3">
-                  {comments.map((comment) => {
-                    const id = getCommentId(comment);
-                    return (
-                      <div key={id} className="flex items-start gap-3">
-                        <Checkbox
-                          checked={selectedIds.has(id)}
-                          onCheckedChange={() => toggleSelection(id)}
-                          className="mt-3"
-                        />
-                        <GitHubCommentCard
-                          author={comment.author}
-                          body={comment.body}
-                          createdAt={comment.created_at}
-                          url={comment.url}
-                          commentType={comment.comment_type}
-                          path={
-                            comment.comment_type === 'review'
-                              ? comment.path
-                              : undefined
-                          }
-                          line={
-                            comment.comment_type === 'review' &&
-                            comment.line != null
-                              ? Number(comment.line)
-                              : undefined
-                          }
-                          diffHunk={
-                            comment.comment_type === 'review'
-                              ? comment.diff_hunk
-                              : undefined
-                          }
-                          variant="full"
-                          onClick={() => toggleSelection(id)}
-                          className="block w-full max-w-none flex-1"
-                        />
-                      </div>
-                    );
-                  })}
-                </div>
-              </>
-            )}
+                  </div>
+                </>
+              )}
+            </div>
           </div>
 
           {!errorMessage && !isLoading && comments.length > 0 && (
-            <DialogFooter className="px-4 py-3 border-t flex-shrink-0">
+            <DialogFooter className="px-4 py-3 border-t">
               <Button variant="outline" onClick={() => handleOpenChange(false)}>
                 {t('common:buttons.cancel')}
               </Button>
diff --git a/frontend/src/components/ui/dialog.tsx b/frontend/src/components/ui/dialog.tsx
index eacfc2ef..6cae8b8b 100644
--- a/frontend/src/components/ui/dialog.tsx
+++ b/frontend/src/components/ui/dialog.tsx
@@ -116,7 +116,7 @@ const Dialog = React.forwardRef<
       <div
         ref={ref}
         className={cn(
-          'relative z-[9999] grid w-full max-w-lg gap-4 bg-primary p-6 shadow-lg duration-200 sm:rounded-lg my-8',
+          'relative z-[9999] flex flex-col w-full max-w-lg gap-4 bg-primary p-6 shadow-lg duration-200 sm:rounded-lg my-8',
           className
         )}
         {...props}
diff --git a/frontend/src/components/ui/github-comment-card.tsx b/frontend/src/components/ui/github-comment-card.tsx
index 72cc8b71..24af811d 100644
--- a/frontend/src/components/ui/github-comment-card.tsx
+++ b/frontend/src/components/ui/github-comment-card.tsx
@@ -12,8 +12,8 @@ export interface GitHubCommentCardProps {
   path?: string;
   line?: number | null;
   diffHunk?: string;
-  // Display variants
-  variant?: 'compact' | 'full';
+  /** Display variant: 'compact' for inline chip, 'full' for inline card, 'list' for block card */
+  variant: 'compact' | 'full' | 'list';
   onClick?: (e: React.MouseEvent) => void;
   onDoubleClick?: (e: React.MouseEvent) => void;
   className?: string;
@@ -111,6 +111,7 @@ function FullCard({
   line,
   diffHunk,
   onClick,
+  variant,
   className,
 }: GitHubCommentCardProps) {
   const { t } = useTranslation('tasks');
@@ -120,7 +121,8 @@ function FullCard({
   return (
     <div
       className={cn(
-        'inline-block align-bottom p-3 bg-muted/50 rounded-md border border-border cursor-pointer hover:border-muted-foreground transition-colors max-w-md',
+        'p-3 bg-muted/50 rounded-md border border-border cursor-pointer hover:border-muted-foreground transition-colors overflow-hidden',
+        variant === 'full' && 'inline-block align-bottom max-w-md',
         className
       )}
       onClick={onClick}
@@ -178,14 +180,12 @@ function FullCard({
 /**
  * GitHubCommentCard - Shared presentational component for GitHub PR comments
  *
- * @param variant - 'compact' for inline WYSIWYG chip, 'full' for dialog card
+ * @param variant - 'compact' for inline chip, 'full' for inline card, 'list' for block card
  */
 export function GitHubCommentCard(props: GitHubCommentCardProps) {
-  const { variant = 'full' } = props;
-
-  if (variant === 'compact') {
+  if (props.variant === 'compact') {
     return <CompactCard {...props} />;
   }
-
+  // Both 'full' and 'list' use FullCard, just with different styling
   return <FullCard {...props} />;
 }