diff --git a/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx b/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx
index 6b632a4548..21b4f486c7 100644
--- a/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx
+++ b/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx
@@ -61,13 +61,13 @@ export const CheckpointMenu = ({ ts, commitHash, currentHash, checkpoint }: Chec
 						setIsOpen(open)
 						setIsConfirming(false)
 					}}>
-					<PopoverTrigger asChild>
-						<StandardTooltip content={t("chat:checkpoint.menu.restore")}>
+					<StandardTooltip content={t("chat:checkpoint.menu.restore")}>
+						<PopoverTrigger asChild>
 							<Button variant="ghost" size="icon">
 								<span className="codicon codicon-history" />
 							</Button>
-						</StandardTooltip>
-					</PopoverTrigger>
+						</PopoverTrigger>
+					</StandardTooltip>
 					<PopoverContent align="end" container={portalContainer}>
 						<div className="flex flex-col gap-2">
 							{!isCurrent && (