diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml
index 1b83bcfa..f5bb7313 100644
--- a/components/PasswordDialog.qml
+++ b/components/PasswordDialog.qml
@@ -100,12 +100,14 @@ Window {
                     }
                 }
                 Keys.onReturnPressed: {
-                    root.accepted()
                     root.close()
+                    root.accepted()
+
                 }
                 Keys.onEscapePressed: {
-                    root.rejected()
                     root.close()
+                    root.rejected()
+
                 }