diff --git a/extensions/helix/package.build.ts b/extensions/helix/package.build.ts
index c22e0c3..c2930f7 100644
--- a/extensions/helix/package.build.ts
+++ b/extensions/helix/package.build.ts
@@ -189,7 +189,7 @@ export const pkg = (modules: Builder.ParsedModule[]) => ({
       }
 
       for (const mode of ["normal", "select"]) {
-        const whenMode = `dance.mode == 'helix/${mode}'`;
+        const whenMode = `editorTextFocus && dance.mode == 'helix/${mode}'`;
         ignoredKeybindings.push(...generateIgnoredKeybinds(
           keybindings.filter(key => key.when.includes(whenMode)),
           whenMode,
diff --git a/extensions/helix/package.json b/extensions/helix/package.json
index 8d9cfe8..b8fb8fe 100644
--- a/extensions/helix/package.json
+++ b/extensions/helix/package.json
@@ -1737,347 +1737,347 @@
       {
         "key": "Q",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+D",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+G",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+H",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+K",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+L",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+M",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+Q",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+R",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+V",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+Y",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+2",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+3",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+5",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+6",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "'",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "-",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "=",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Tab",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Space",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "NumPad_Add",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "NumPad_Subtract",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+=",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+Tab",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+Space",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+NumPad_Add",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Shift+NumPad_Subtract",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/normal'"
+        "when": "editorTextFocus && dance.mode == 'helix/normal'"
       },
       {
         "key": "Q",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "R",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "0",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "1",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "2",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "3",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "4",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "5",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "6",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "7",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "8",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "9",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+D",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+G",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+H",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+K",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+L",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+M",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+Q",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+R",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+V",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+Y",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+0",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+2",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+3",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+5",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+6",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+7",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+8",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "'",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "-",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "=",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Tab",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Space",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "NumPad_Add",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "NumPad_Subtract",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+'",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+=",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+Tab",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+Space",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+NumPad_Add",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       },
       {
         "key": "Shift+NumPad_Subtract",
         "command": "dance.ignore",
-        "when": "dance.mode == 'helix/select'"
+        "when": "editorTextFocus && dance.mode == 'helix/select'"
       }
     ]
   }
diff --git a/package.build.ts b/package.build.ts
index ba3ace4..8c7ede2 100644
--- a/package.build.ts
+++ b/package.build.ts
@@ -763,7 +763,7 @@ export const pkg = (modules: Builder.ParsedModule[]) => ({
 
       return [
         ...keybindings,
-        ...generateIgnoredKeybinds(keybindings,`dance.mode == 'normal'`),
+        ...generateIgnoredKeybinds(keybindings,`editorTextFocus && dance.mode == 'normal'`),
       ];
     })(),
 
diff --git a/package.json b/package.json
index 4c3399d..06b4814 100644
--- a/package.json
+++ b/package.json
@@ -4023,92 +4023,92 @@
       {
         "key": "Shift+D",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "Shift+X",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "Shift+Y",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "Shift+2",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "Shift+3",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "Shift+6",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "'",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "-",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "=",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "Tab",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "Space",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "NumPad_Add",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "NumPad_Subtract",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "Shift+=",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "Shift+Tab",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "Shift+Space",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "Shift+NumPad_Add",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       },
       {
         "key": "Shift+NumPad_Subtract",
         "command": "dance.ignore",
-        "when": "dance.mode == 'normal'"
+        "when": "editorTextFocus && dance.mode == 'normal'"
       }
     ]
   }