diff --git a/electrum/gui/qml/components/Pin.qml b/electrum/gui/qml/components/Pin.qml
index 1c9f8b724..180c4f0c9 100644
--- a/electrum/gui/qml/components/Pin.qml
+++ b/electrum/gui/qml/components/Pin.qml
@@ -23,7 +23,7 @@ ElDialog {
 
     focus: true
 
-    closePolicy: canCancel ? Popup.CloseOnPressOutside : Popup.NoAutoClose
+    closePolicy: canCancel ? Popup.CloseOnEscape | Popup.CloseOnPressOutside : Popup.NoAutoClose
 
     property bool canCancel: true
 
diff --git a/electrum/gui/qml/components/controls/ElDialog.qml b/electrum/gui/qml/components/controls/ElDialog.qml
index 71079d7aa..1caa8e71d 100644
--- a/electrum/gui/qml/components/controls/ElDialog.qml
+++ b/electrum/gui/qml/components/controls/ElDialog.qml
@@ -19,7 +19,7 @@ Dialog {
     }
 
     closePolicy: allowClose
-        ? Popup.CloseOnPressOutside
+        ? Popup.CloseOnEscape | Popup.CloseOnPressOutside
         : Popup.NoAutoClose
 
     onOpenedChanged: {
diff --git a/electrum/gui/qml/components/main.qml b/electrum/gui/qml/components/main.qml
index d97e3f1e2..a44cdbb13 100644
--- a/electrum/gui/qml/components/main.qml
+++ b/electrum/gui/qml/components/main.qml
@@ -439,14 +439,6 @@ ApplicationWindow
         }
     }
 
-    Shortcut {
-        context: Qt.ApplicationShortcut
-        sequence: "Esc"
-        onActivated: {
-            close()
-        }
-    }
-
     Connections {
         target: Daemon
         function onWalletRequiresPassword(name, path) {