diff --git a/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx b/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx
index 22802cd455..0e65cfa5cd 100644
--- a/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx
+++ b/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx
@@ -173,7 +173,7 @@ export const CheckpointMenu = ({ ts, commitHash, checkpoint, onOpenChange }: Che
 						</Button>
 					</PopoverTrigger>
 				</StandardTooltip>
-				<PopoverContent align="end" container={portalContainer}>
+				<PopoverContent align="end" container={portalContainer} className="w-auto min-w-max">
 					<div className="flex flex-col gap-2">
 						<Button
 							variant="secondary"
diff --git a/webview-ui/src/components/chat/checkpoints/__tests__/CheckpointSaved.spec.tsx b/webview-ui/src/components/chat/checkpoints/__tests__/CheckpointSaved.spec.tsx
index 043e7eb729..4c17e06a9e 100644
--- a/webview-ui/src/components/chat/checkpoints/__tests__/CheckpointSaved.spec.tsx
+++ b/webview-ui/src/components/chat/checkpoints/__tests__/CheckpointSaved.spec.tsx
@@ -20,7 +20,11 @@ vi.mock("@/components/ui", () => {
 			)
 		},
 		PopoverTrigger: ({ children }: any) => <div data-testid="popover-trigger">{children}</div>,
-		PopoverContent: ({ children }: any) => <div data-testid="popover-content">{children}</div>,
+		PopoverContent: ({ children, className, ...rest }: any) => (
+			<div data-testid="popover-content" className={className} {...rest}>
+				{children}
+			</div>
+		),
 	}
 })