1 files changed, 21 insertions, 0 deletions
diff --git a/lib/device_scan_select.dart b/lib/device_scan_select.dart
index 27b7492..7dafe2b 100644
--- a/lib/device_scan_select.dart
+++ b/lib/device_scan_select.dart
@@ -61,6 +61,27 @@ class _DeviceScanSelectionState extends State<DeviceScanSelection> {
       ),
     );
   }
+
+  @override
+  void didUpdateWidget(covariant DeviceScanSelection oldWidget) {
+    super.didUpdateWidget(oldWidget);
+
+    if (!_deviceListEqual(oldWidget.items, widget.items)) {
+      setState(() {
+        selectedResult = -1;
+      });
+    }
+  }
+
+  bool _deviceListEqual(List<ScanResult> oldList, List<ScanResult> newList) {
+    if (oldList.length != newList.length) return false;
+    for (int i = 0; i < oldList.length; i++) {
+      if (oldList[i].device.remoteId != newList[i].device.remoteId) {
+        return false;
+      }
+    }
+    return true;
+  }
 }
 
 String firstGiven(List<String> list) {