diff --git a/VERSION b/VERSION
index 703cec9..6a0ca2d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.6
\ No newline at end of file
+2.0.7
\ No newline at end of file
diff --git a/modules/XRLinuxDriver b/modules/XRLinuxDriver
index 1cc7520..6bf15a7 160000
--- a/modules/XRLinuxDriver
+++ b/modules/XRLinuxDriver
@@ -1 +1 @@
-Subproject commit 1cc7520d725df7f568ac78d9d19eb6f0881f1680
+Subproject commit 6bf15a75fc3cec0e6a25848344051ee73f447120
diff --git a/ui/src/connecteddevice.py b/ui/src/connecteddevice.py
index 396653e..f9e6593 100644
--- a/ui/src/connecteddevice.py
+++ b/ui/src/connecteddevice.py
@@ -339,6 +339,11 @@ class ConnectedDevice(Gtk.Box):
         for pid, child in self.virtual_displays_by_pid.items():
             self.top_features_group.remove(child)
 
+        self.top_features_group.add(self.launch_display_settings_row)
+        self.launch_display_settings_row.set_visible(
+            self._settings_displays_app_info is not None and virtual_displays_present
+        )
+
         new_displays_by_pid = {}
         for display in virtual_display_manager.displays:
             child = self.virtual_displays_by_pid.get(
@@ -346,11 +351,6 @@ class ConnectedDevice(Gtk.Box):
                 VirtualDisplayRow(display['pid'], display['width'], display['height'], 60))
             self.top_features_group.add(child)
             new_displays_by_pid[display['pid']] = child
-
-        self.top_features_group.add(self.launch_display_settings_row)
-        self.launch_display_settings_row.set_visible(
-            self._settings_displays_app_info is not None and virtual_displays_present
-        )
         
         self.virtual_displays_by_pid = new_displays_by_pid