diff --git a/src/web-view/src/core/shadcn/dialog.tsx b/src/web-view/src/core/shadcn/dialog.tsx
index 5fcd1556..e52ff14f 100644
--- a/src/web-view/src/core/shadcn/dialog.tsx
+++ b/src/web-view/src/core/shadcn/dialog.tsx
@@ -44,6 +44,41 @@ function DialogOverlay({
   );
 }
 
+function CustomOverlay({
+  className,
+  ...props
+}: React.ComponentProps<"div">) {
+  React.useEffect(() => {
+    document.body.classList.add('dialog-open');
+
+    return () => {
+      document.body.classList.remove('dialog-open');
+    };
+  }, []);
+
+  return (
+    <div
+      className={cn(
+        "absolute inset-0 z-50 bg-black/50",
+        className
+      )}
+      onClick={(e) => {
+        if (e.target === e.currentTarget) {
+          const escEvent = new KeyboardEvent('keydown', {
+            key: 'Escape',
+            code: 'Escape',
+            keyCode: 27,
+            which: 27,
+            bubbles: true
+          });
+          document.dispatchEvent(escEvent);
+        }
+      }}
+      {...props}
+    />
+  );
+}
+
 function DialogContent({
   className,
   children,
@@ -54,7 +89,7 @@ function DialogContent({
 }) {
   return (
     <DialogPortal data-slot="dialog-portal">
-      <DialogOverlay />
+      <CustomOverlay />
       <DialogPrimitive.Content
         data-slot="dialog-content"
         className={cn(
diff --git a/src/web-view/src/style.css b/src/web-view/src/style.css
index 858e1a43..383aab5f 100644
--- a/src/web-view/src/style.css
+++ b/src/web-view/src/style.css
@@ -121,3 +121,7 @@
     @apply bg-background text-foreground;
   }
 }
+
+body.dialog-open {
+  overflow: hidden !important;
+}
diff --git a/versions/quick-command-buttons-0.1.4.vsix b/versions/quick-command-buttons-0.1.4.vsix
index 11efc880..d2727cf2 100644
Binary files a/versions/quick-command-buttons-0.1.4.vsix and b/versions/quick-command-buttons-0.1.4.vsix differ