diff --git a/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx b/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx
index d2fb860668..c4e2f63c15 100644
--- a/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx
+++ b/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx
@@ -88,59 +88,61 @@ export const CheckpointMenu = ({
 				</StandardTooltip>
 				<PopoverContent align="end" container={portalContainer}>
 					<div className="flex flex-col gap-2">
-						{!isCurrent && (
-							<div className="flex flex-col gap-1 group hover:text-foreground">
-								<Button variant="secondary" onClick={onPreview} data-testid="restore-files-btn">
-									{t("chat:checkpoint.menu.restoreFiles")}
-								</Button>
-								<div className="text-muted transition-colors group-hover:text-foreground">
-									{t("chat:checkpoint.menu.restoreFilesDescription")}
-								</div>
-							</div>
-						)}
-						{!isCurrent && (
-							<div className="flex flex-col gap-1 group hover:text-foreground">
+						{isCurrent ? (
+							<div className="text-muted p-2 text-center">{t("chat:checkpoint.menu.alreadyCurrent")}</div>
+						) : (
+							<>
 								<div className="flex flex-col gap-1 group hover:text-foreground">
-									{!isConfirming ? (
-										<Button
-											variant="secondary"
-											onClick={() => setIsConfirming(true)}
-											data-testid="restore-files-and-task-btn">
-											{t("chat:checkpoint.menu.restoreFilesAndTask")}
-										</Button>
-									) : (
-										<>
-											<Button
-												variant="default"
-												onClick={onRestore}
-												className="grow"
-												data-testid="confirm-restore-btn">
-												<div className="flex flex-row gap-1">
-													<CheckIcon />
-													<div>{t("chat:checkpoint.menu.confirm")}</div>
-												</div>
-											</Button>
-											<Button variant="secondary" onClick={() => setIsConfirming(false)}>
-												<div className="flex flex-row gap-1">
-													<Cross2Icon />
-													<div>{t("chat:checkpoint.menu.cancel")}</div>
-												</div>
-											</Button>
-										</>
-									)}
-									{isConfirming ? (
-										<div
-											data-testid="checkpoint-confirm-warning"
-											className="text-destructive font-bold">
-											{t("chat:checkpoint.menu.cannotUndo")}
-										</div>
-									) : (
-										<div className="text-muted transition-colors group-hover:text-foreground">
-											{t("chat:checkpoint.menu.restoreFilesAndTaskDescription")}
-										</div>
-									)}
+									<Button variant="secondary" onClick={onPreview} data-testid="restore-files-btn">
+										{t("chat:checkpoint.menu.restoreFiles")}
+									</Button>
+									<div className="text-muted transition-colors group-hover:text-foreground">
+										{t("chat:checkpoint.menu.restoreFilesDescription")}
+									</div>
 								</div>
-							</div>
+								<div className="flex flex-col gap-1 group hover:text-foreground">
+									<div className="flex flex-col gap-1 group hover:text-foreground">
+										{!isConfirming ? (
+											<Button
+												variant="secondary"
+												onClick={() => setIsConfirming(true)}
+												data-testid="restore-files-and-task-btn">
+												{t("chat:checkpoint.menu.restoreFilesAndTask")}
+											</Button>
+										) : (
+											<>
+												<Button
+													variant="default"
+													onClick={onRestore}
+													className="grow"
+													data-testid="confirm-restore-btn">
+													<div className="flex flex-row gap-1">
+														<CheckIcon />
+														<div>{t("chat:checkpoint.menu.confirm")}</div>
+													</div>
+												</Button>
+												<Button variant="secondary" onClick={() => setIsConfirming(false)}>
+													<div className="flex flex-row gap-1">
+														<Cross2Icon />
+														<div>{t("chat:checkpoint.menu.cancel")}</div>
+													</div>
+												</Button>
+											</>
+										)}
+										{isConfirming ? (
+											<div
+												data-testid="checkpoint-confirm-warning"
+												className="text-destructive font-bold">
+												{t("chat:checkpoint.menu.cannotUndo")}
+											</div>
+										) : (
+											<div className="text-muted transition-colors group-hover:text-foreground">
+												{t("chat:checkpoint.menu.restoreFilesAndTaskDescription")}
+											</div>
+										)}
+									</div>
+								</div>
+							</>
 						)}
 					</div>
 				</PopoverContent>
diff --git a/webview-ui/src/i18n/locales/en/chat.json b/webview-ui/src/i18n/locales/en/chat.json
index 9ab37b1149..4527e61ad2 100644
--- a/webview-ui/src/i18n/locales/en/chat.json
+++ b/webview-ui/src/i18n/locales/en/chat.json
@@ -161,7 +161,8 @@
 			"confirm": "Confirm",
 			"cancel": "Cancel",
 			"cannotUndo": "This action cannot be undone.",
-			"restoreFilesAndTaskDescription": "Restores your project's files back to a snapshot taken at this point and deletes all messages after this point."
+			"restoreFilesAndTaskDescription": "Restores your project's files back to a snapshot taken at this point and deletes all messages after this point.",
+			"alreadyCurrent": "This checkpoint is already current"
 		},
 		"current": "Current"
 	},