diff --git a/electrum/gui/qt/wizard/wallet.py b/electrum/gui/qt/wizard/wallet.py
index 18e2b61ef..a2be98b6d 100644
--- a/electrum/gui/qt/wizard/wallet.py
+++ b/electrum/gui/qt/wizard/wallet.py
@@ -60,7 +60,8 @@ class QEKeystoreWizard(KeystoreWizard, QEAbstractWizard, MessageBoxMixin):
         # attach gui classes to views
         self.navmap_merge({
             'keystore_type': {'gui': WCExtendKeystore},
-            'enterseed': {'gui': WCHaveSeed},
+            'enter_seed': {'gui': WCHaveSeed},
+            'enter_ext': {'gui': WCEnterExt},
             'choose_hardware_device': {'gui': WCChooseHWDevice},
             'script_and_derivation': {'gui': WCScriptAndDerivation},
             'wallet_password': {'gui': WCWalletPassword},
diff --git a/electrum/wizard.py b/electrum/wizard.py
index de18382aa..da47eac8e 100644
--- a/electrum/wizard.py
+++ b/electrum/wizard.py
@@ -813,7 +813,10 @@ class KeystoreWizard(NewWalletWizard):
             'keystore_type': {
                 'next': self.on_keystore_type
             },
-            'enterseed': {
+            'enter_seed': {
+                'next': lambda d: 'enter_ext' if self.wants_ext(d) else self.update_keystore
+            },
+            'enter_ext': {
                 'accept': self.update_keystore,
                 'last': True
             },
@@ -833,7 +836,7 @@ class KeystoreWizard(NewWalletWizard):
     def on_keystore_type(self, wizard_data: dict) -> str:
         t = wizard_data['keystore_type']
         return {
-            'haveseed': 'enterseed',
+            'haveseed': 'enter_seed',
             'hardware': 'choose_hardware_device'
         }.get(t)