diff --git a/electrum/gui/qt/util.py b/electrum/gui/qt/util.py
index 0b11435e9..d9d539549 100644
--- a/electrum/gui/qt/util.py
+++ b/electrum/gui/qt/util.py
@@ -542,6 +542,7 @@ class ChoiceWidget(QWidget):
         assert isinstance(choices, list)
         iterator = enumerate(choices)
         for i, c in iterator:
+            assert isinstance(c, tuple), f"{c=!r}"
             button = QRadioButton(gb2)
             button.setText(c[1])
             vbox2.addWidget(button)
diff --git a/electrum/plugin.py b/electrum/plugin.py
index 48888c9df..d9ccae939 100644
--- a/electrum/plugin.py
+++ b/electrum/plugin.py
@@ -1076,7 +1076,8 @@ class DeviceMgr(ThreadJob):
                         for info in infos]
         self.logger.debug(f"select_device. prompting user for manual selection of {plugin.device}. "
                           f"num options: {len(infos)}. options: {infos}")
-        c = handler.query_choice(msg, descriptions)
+        choices = list(enumerate(descriptions))
+        c = handler.query_choice(msg, choices)
         if c is None:
             raise UserCancelled()
         info = infos[c]