diff --git a/electrum/gui/qt/wizard/wallet.py b/electrum/gui/qt/wizard/wallet.py
index 016e4f118..94d6ccad9 100644
--- a/electrum/gui/qt/wizard/wallet.py
+++ b/electrum/gui/qt/wizard/wallet.py
@@ -1119,12 +1119,11 @@ class WCChooseHWDevice(WizardComponent, Logger):
             choices.append(((name, info), descr))
         msg = _('Select a device') + ':'
 
-        # remove old component before adding anew
-        a = self.device_list.layout().itemAt(0)
-        self.device_list.layout().removeItem(a)
+        if self.choice_w:
+            self.device_list_layout.removeWidget(self.choice_w)
 
         self.choice_w = ChoiceWidget(message=msg, choices=choices)
-        self.device_list.layout().addWidget(self.choice_w)
+        self.device_list_layout.addWidget(self.choice_w)
 
         self.valid = True
 
@@ -1133,9 +1132,6 @@ class WCChooseHWDevice(WizardComponent, Logger):
         else:
             self.rescan_button.setFocus()
 
-
-
-
     def scan_devices(self):
         self.valid = False
         self.busy_msg = _('Scanning devices...')