diff --git a/electrum/gui/qt/wizard/wallet.py b/electrum/gui/qt/wizard/wallet.py
index 4c1851cc4..749b49969 100644
--- a/electrum/gui/qt/wizard/wallet.py
+++ b/electrum/gui/qt/wizard/wallet.py
@@ -381,7 +381,7 @@ class WCWalletName(WalletWizardComponent, Logger):
                 pw_label.show()
                 self.pw_e.show()
                 if not self.name_e.hasFocus():
-                    self.pw_e.setFocus(True)
+                    self.pw_e.setFocus()
             else:
                 pw_label.hide()
                 self.pw_e.hide()
diff --git a/electrum/gui/qt/wizard/wizard.py b/electrum/gui/qt/wizard/wizard.py
index a1146f552..a8a19bc6a 100644
--- a/electrum/gui/qt/wizard/wizard.py
+++ b/electrum/gui/qt/wizard/wizard.py
@@ -47,10 +47,13 @@ class QEAbstractWizard(QDialog, MessageBoxMixin):
         self.back_button = QPushButton(_("Back"), self)
         self.back_button.clicked.connect(self.on_back_button_clicked)
         self.back_button.setEnabled(False)
+        self.back_button.setDefault(False)
+        self.back_button.setAutoDefault(False)
         self.next_button = QPushButton(_("Next"), self)
         self.next_button.clicked.connect(self.on_next_button_clicked)
         self.next_button.setEnabled(False)
         self.next_button.setDefault(True)
+        self.next_button.setAutoDefault(True)
         self.requestPrev.connect(self.on_back_button_clicked)
         self.requestNext.connect(self.on_next_button_clicked)
         self.logo = QLabel()
@@ -126,7 +129,6 @@ class QEAbstractWizard(QDialog, MessageBoxMixin):
         self.load_next_component(viewstate.view, viewstate.wizard_data, viewstate.params)
         # TODO: re-test if needed on macOS
         self.refresh_gui()  # Need for QT on MacOSX.  Lame.
-        self.next_button.setFocus() # setDefault() is not enough
 
     def refresh_gui(self):
         # For some reason, to refresh the GUI this needs to be called twice