diff --git a/package.json b/package.json
index 7370d96..8e602b1 100644
--- a/package.json
+++ b/package.json
@@ -2857,7 +2857,7 @@
             {
                 "command": "gitlens.key.escape",
                 "key": "escape",
-                "when": "gitlens:key:escape"
+                "when": "gitlens:key:escape && editorTextFocus && !findWidgetVisible && !renameInputVisible && !suggestWidgetVisible && !isInEmbeddedEditor"
             },
             {
                 "command": "gitlens.toggleFileBlame",