diff --git a/ui/onboarding/CreatePasswordModal.qml b/ui/onboarding/CreatePasswordModal.qml
index 934a4f70f2..30806c6496 100644
--- a/ui/onboarding/CreatePasswordModal.qml
+++ b/ui/onboarding/CreatePasswordModal.qml
@@ -50,7 +50,9 @@ ModalPopup {
         placeholderText: qsTrId("confirm-password…")
         textField.echoMode: TextInput.Password
         Keys.onReturnPressed: function(event) {
-            submitBtn.clicked(event)
+            if (submitBtn.enabled) {
+                submitBtn.clicked(event)
+            }
         }
         onTextChanged: {
             [repeatPasswordFieldValid, repeatPasswordValidationError] =