diff --git a/electrum/gui/qt/wizard/wallet.py b/electrum/gui/qt/wizard/wallet.py
index a485193b7..9ffc2255c 100644
--- a/electrum/gui/qt/wizard/wallet.py
+++ b/electrum/gui/qt/wizard/wallet.py
@@ -366,6 +366,8 @@ class WCWalletName(WizardComponent, Logger):
             if user_needs_to_enter_password:
                 pw_label.show()
                 self.pw_e.show()
+                if not self.name_e.hasFocus():
+                    self.pw_e.setFocus(True)
             else:
                 pw_label.hide()
                 self.pw_e.hide()
diff --git a/electrum/plugins/hw_wallet/plugin.py b/electrum/plugins/hw_wallet/plugin.py
index f55514fc0..3795dc490 100644
--- a/electrum/plugins/hw_wallet/plugin.py
+++ b/electrum/plugins/hw_wallet/plugin.py
@@ -182,6 +182,12 @@ class HW_PluginBase(BasePlugin):
         """
         return device.product_key in self.DEVICE_IDS
 
+    @abstractmethod
+    def wizard_entry_for_device(self, device_info: 'DeviceInfo', *, new_wallet: bool) -> str:
+        """Return view name for device
+        """
+        pass
+
 
 class HardwareClientBase(ABC):
     handler = None  # type: Optional['HardwareHandlerBase']
diff --git a/electrum/plugins/keepkey/qt.py b/electrum/plugins/keepkey/qt.py
index acebce3f1..b9a17dd33 100644
--- a/electrum/plugins/keepkey/qt.py
+++ b/electrum/plugins/keepkey/qt.py
@@ -231,6 +231,7 @@ class KeepkeyInitLayout(QVBoxLayout):
     validChanged = pyqtSignal([bool], arguments=['valid'])
 
     def __init__(self, method, device):
+        QVBoxLayout.__init__(self)
         self.method = method
 
         label = QLabel(_("Enter a label to name your device:"))
@@ -257,8 +258,8 @@ class KeepkeyInitLayout(QVBoxLayout):
                 self.bg.setId(rb, i)
                 hbox1.addWidget(rb)
                 rb.setChecked(True)
-            cb_pin = QCheckBox(_('Enable PIN protection'))
-            cb_pin.setChecked(True)
+            self.cb_pin = QCheckBox(_('Enable PIN protection'))
+            self.cb_pin.setChecked(True)
         else:
             self.text_e = QTextEdit()
             self.text_e.setMaximumHeight(60)
@@ -285,7 +286,7 @@ class KeepkeyInitLayout(QVBoxLayout):
 
         if method in [TIM_NEW, TIM_RECOVER]:
             self.addWidget(WWLabel(RECOMMEND_PIN))
-            self.addWidget(cb_pin)
+            self.addWidget(self.cb_pin)
         else:
             self.addLayout(hbox_pin)
 
@@ -331,9 +332,9 @@ class Plugin(KeepKeyPlugin, QtPlugin):
         views = {
             'keepkey_start': {'gui': WCScriptAndDerivation},
             'keepkey_xpub': {'gui': WCHWXPub},
-            'safet_not_initialized': {'gui': WCKeepkeyInitMethod},
-            'safet_choose_new_recover': {'gui': WCKeepkeyInitParams},
-            'safet_do_init': {'gui': WCKeepkeyInit},
+            'keepkey_not_initialized': {'gui': WCKeepkeyInitMethod},
+            'keepkey_choose_new_recover': {'gui': WCKeepkeyInitParams},
+            'keepkey_do_init': {'gui': WCKeepkeyInit},
             'keepkey_unlock': {'gui': WCHWUnlock}
         }
         wizard.navmap_merge(views)
@@ -640,7 +641,7 @@ class WCKeepkeyInitParams(WizardComponent):
 
     def on_ready(self):
         _name, _info = self.wizard_data['hardware_device']
-        self.settings_layout = KeepkeyInitLayout(self.plugins.device_manager, self.wizard_data['keepkey_init'], _info.device.id_)
+        self.settings_layout = KeepkeyInitLayout(self.wizard_data['keepkey_init'], _info.device.id_)
         self.layout().addLayout(self.settings_layout)
         self.layout().addStretch(1)
 
diff --git a/electrum/plugins/safe_t/qt.py b/electrum/plugins/safe_t/qt.py
index ee72665a5..374335bb6 100644
--- a/electrum/plugins/safe_t/qt.py
+++ b/electrum/plugins/safe_t/qt.py
@@ -573,7 +573,7 @@ class WCSafeTInitParams(WizardComponent):
 
     def on_ready(self):
         _name, _info = self.wizard_data['hardware_device']
-        self.settings_layout = SafeTInitLayout(self.plugins.device_manager, self.wizard_data['safe_t_init'], _info.device.id_)
+        self.settings_layout = SafeTInitLayout(self.wizard_data['safe_t_init'], _info.device.id_)
         self.layout().addLayout(self.settings_layout)
         self.layout().addStretch(1)