diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml
index 964ab9a6..43d2a2e6 100644
--- a/components/PasswordDialog.qml
+++ b/components/PasswordDialog.qml
@@ -253,6 +253,9 @@ Item {
                 Keys.enabled: root.visible
                 Keys.onEnterPressed: Keys.onReturnPressed(event)
                 Keys.onReturnPressed: {
+                    if (!passwordDialogMode && passwordInput1.text !== passwordInput2.text) {
+                        return;
+                    }
                     root.close()
                     if (passwordDialogMode) {
                         root.accepted()