diff --git a/src/app/(windows)/QueryWindow.tsx b/src/app/(windows)/QueryWindow.tsx
index 265d6564..d0da2c6e 100644
--- a/src/app/(windows)/QueryWindow.tsx
+++ b/src/app/(windows)/QueryWindow.tsx
@@ -15,6 +15,7 @@ import { useAutoComplete } from "@/context/AutoCompleteProvider";
 import { MultipleQueryProgress, multipleQuery } from "@/lib/multiple-query";
 import QueryProgressLog from "../(components)/QueryProgressLog";
 import OptimizeTableState from "../(components)/OptimizeTable/OptimizeTableState";
+import { KEY_BINDING } from "@/lib/key-matcher";
 
 export default function QueryWindow() {
   const { schema } = useAutoComplete();
@@ -44,19 +45,34 @@ export default function QueryWindow() {
       .catch(console.error);
   };
 
+  console.log(KEY_BINDING.run.toCodeMirrorKey());
+
   return (
     <ResizablePanelGroup direction="vertical">
       <ResizablePanel style={{ position: "relative" }}>
         <div className="absolute left-0 right-0 top-0 bottom-0 flex flex-col">
           <div className="flex-grow overflow-hidden">
-            <SqlEditor value={code} onChange={setCode} schema={schema} />
+            <SqlEditor
+              value={code}
+              onChange={setCode}
+              schema={schema}
+              onKeyDown={(e) => {
+                if (KEY_BINDING.run.match(e)) {
+                  onRunClicked();
+                  e.preventDefault();
+                }
+              }}
+            />
           </div>
           <div className="flex-grow-0 flex-shrink-0">
             <Separator />
-            <div className="flex gap-2 p-1">
+            <div className="flex gap-1 p-1">
               <Button variant={"ghost"} onClick={onRunClicked}>
                 <LucidePlay className="w-4 h-4 mr-2" />
-                Run
+                Run{" "}
+                <span className="text-xs ml-2 px-2 bg-secondary py-1 rounded">
+                  {KEY_BINDING.run.toString()}
+                </span>
               </Button>
             </div>
           </div>
diff --git a/src/components/SqlEditor.tsx b/src/components/SqlEditor.tsx
index fa576c77..8fe153e7 100644
--- a/src/components/SqlEditor.tsx
+++ b/src/components/SqlEditor.tsx
@@ -2,6 +2,11 @@ import { tags as t } from "@lezer/highlight";
 import { createTheme } from "@uiw/codemirror-themes";
 import CodeMirror from "@uiw/react-codemirror";
 import { sql, SQLite } from "@codemirror/lang-sql";
+import { KeyboardEventHandler, useMemo } from "react";
+
+import { defaultKeymap } from "@codemirror/commands";
+import { keymap } from "@codemirror/view";
+import { KEY_BINDING } from "@/lib/key-matcher";
 
 const theme = createTheme({
   theme: "light",
@@ -39,12 +44,34 @@ interface SqlEditorProps {
   value: string;
   onChange: (value: string) => void;
   schema?: Record<string, string[]>;
+  onKeyDown?: KeyboardEventHandler<HTMLDivElement>;
 }
 
-export default function SqlEditor({ value, onChange, schema }: SqlEditorProps) {
+export default function SqlEditor({
+  value,
+  onChange,
+  schema,
+  onKeyDown,
+}: SqlEditorProps) {
+  const keyExtensions = useMemo(() => {
+    return keymap.of([
+      {
+        key: KEY_BINDING.run.toCodeMirrorKey(),
+        preventDefault: true,
+        run: () => true,
+      },
+      ...defaultKeymap,
+    ]);
+  }, []);
+
   return (
     <CodeMirror
       autoFocus
+      onKeyDown={onKeyDown}
+      basicSetup={{
+        defaultKeymap: false,
+        drawSelection: false,
+      }}
       theme={theme}
       value={value}
       height="100%"
@@ -54,6 +81,7 @@ export default function SqlEditor({ value, onChange, schema }: SqlEditorProps) {
         height: "100%",
       }}
       extensions={[
+        keyExtensions,
         sql({
           dialect: SQLite,
           schema,
diff --git a/src/lib/key-matcher.ts b/src/lib/key-matcher.ts
new file mode 100644
index 00000000..7f3f11ff
--- /dev/null
+++ b/src/lib/key-matcher.ts
@@ -0,0 +1,77 @@
+interface KeyMatcherProps {
+  ctrl?: boolean;
+  key?: string;
+  shift?: boolean;
+}
+
+export default class KeyMatcher {
+  protected key: KeyMatcherProps;
+
+  constructor(props: KeyMatcherProps) {
+    this.key = props;
+  }
+
+  static capture(e: KeyboardEvent | React.KeyboardEvent) {
+    const isCtrlKey = e.ctrlKey || e.metaKey;
+
+    let key: string | undefined = e.key;
+
+    if (key === "Shift") key = undefined;
+    if (key === "Control") key = undefined;
+
+    return new KeyMatcher({
+      ctrl: isCtrlKey,
+      shift: e.shiftKey,
+      key,
+    });
+  }
+
+  match(e: KeyboardEvent | React.KeyboardEvent<HTMLDivElement>) {
+    let isMatched = true;
+    const isCtrlKey = e.ctrlKey || e.metaKey;
+
+    if (this.key.ctrl && !isCtrlKey) {
+      isMatched = false;
+    }
+
+    if (this.key.key && e.key !== this.key.key) {
+      isMatched = false;
+    }
+
+    if (this.key.shift && !e.shiftKey) {
+      isMatched = false;
+    }
+
+    return isMatched;
+  }
+
+  toJson(): KeyMatcherProps {
+    return { ...this.key };
+  }
+
+  toString() {
+    const isMac = navigator.userAgent.toLowerCase().indexOf("mac") > -1;
+    return [
+      this.key.ctrl ? (isMac ? "⌘" : "Ctrl") : undefined,
+      this.key.shift ? "Shift" : undefined,
+      this.key?.key?.toUpperCase(),
+    ]
+      .filter(Boolean)
+      .join(" + ");
+  }
+
+  toCodeMirrorKey() {
+    const isMac = navigator.userAgent.toLowerCase().indexOf("mac") > -1;
+    return [
+      this.key.ctrl ? (isMac ? "Cmd" : "Ctrl") : undefined,
+      this.key.shift ? "Shift" : undefined,
+      this.key?.key,
+    ]
+      .filter(Boolean)
+      .join("-");
+  }
+}
+
+export const KEY_BINDING = {
+  run: new KeyMatcher({ ctrl: true, key: "Enter" }),
+};