diff --git a/modules/bar/popouts/WirelessPassword.qml b/modules/bar/popouts/WirelessPassword.qml
index e80e9148..8858273d 100644
--- a/modules/bar/popouts/WirelessPassword.qml
+++ b/modules/bar/popouts/WirelessPassword.qml
@@ -280,6 +280,11 @@ ColumnLayout {
                         forceActiveFocus();
                     }
 
+                    if (event.key === Qt.Key_Escape) {
+                        event.accepted = false;
+                        closeDialog();
+                    }
+
                     // Clear error when user starts typing
                     if (connectButton.hasError && event.text && event.text.length > 0) {
                         connectButton.hasError = false;
@@ -298,6 +303,10 @@ ColumnLayout {
                         }
                         event.accepted = true;
                     } else if (event.text && event.text.length > 0) {
+                        if (event.key === Qt.Key_Tab) {
+                            event.accepted = false;
+                            return;
+                        }
                         passwordBuffer += event.text;
                         event.accepted = true;
                     }
diff --git a/modules/controlcenter/network/WirelessPasswordDialog.qml b/modules/controlcenter/network/WirelessPasswordDialog.qml
index 40711730..8700f1c4 100644
--- a/modules/controlcenter/network/WirelessPasswordDialog.qml
+++ b/modules/controlcenter/network/WirelessPasswordDialog.qml
@@ -202,6 +202,11 @@ Item {
                         forceActiveFocus();
                     }
 
+                    if (event.key === Qt.Key_Escape) {
+                        event.accepted = false;
+                        closeDialog();
+                    }
+
                     if (connectButton.hasError && event.text && event.text.length > 0) {
                         connectButton.hasError = false;
                     }
@@ -219,6 +224,10 @@ Item {
                         }
                         event.accepted = true;
                     } else if (event.text && event.text.length > 0) {
+                        if (event.key === Qt.Key_Tab) {
+                            event.accepted = false;
+                            return;
+                        }
                         passwordBuffer += event.text;
                         event.accepted = true;
                     }