diff --git a/ui/src/statemanager.py b/ui/src/statemanager.py
index 5db03fb..b7aadfc 100644
--- a/ui/src/statemanager.py
+++ b/ui/src/statemanager.py
@@ -99,9 +99,11 @@ class StateManager(GObject.GObject):
         elif self.license_present:
             self.set_property('license-present', False)
 
-        self.set_property('follow-mode', self.state.get('breezy_desktop_smooth_follow_enabled', False))
-        self.set_property('device-supports-sbs', self.state.get('sbs_mode_supported', False))
-        self.set_property('widescreen-mode', self.state.get('sbs_mode_enabled', False))
+        # only update these properties if a device is still connected
+        if (self.connected_device_name):
+            self.set_property('follow-mode', self.state.get('breezy_desktop_smooth_follow_enabled', False))
+            self.set_property('device-supports-sbs', self.state.get('sbs_mode_supported', False))
+            self.set_property('widescreen-mode', self.state.get('sbs_mode_enabled', False))
 
         if self.running: threading.Timer(1.0, self._refresh_state).start()
 
diff --git a/ui/src/window.py b/ui/src/window.py
index 85a9cab..372255a 100644
--- a/ui/src/window.py
+++ b/ui/src/window.py
@@ -75,11 +75,9 @@ class BreezydesktopWindow(Gtk.ApplicationWindow):
         for child in self.main_content:
             self.main_content.remove(child)
 
-        if not self._skip_verification:
-            if not verify_installation():
-                self.main_content.append(self.failed_verification)
-
-        if not self.state_manager.driver_running:
+        if not self._skip_verification and not verify_installation():
+            self.main_content.append(self.failed_verification)
+        elif not self.state_manager.driver_running:
             self.main_content.append(self.no_driver)
         elif not state_manager.connected_device_name:
             self.main_content.append(self.no_device)