diff --git a/virt-manager b/virt-manager
index 9a26dd5b7..2f501e49f 100755
--- a/virt-manager
+++ b/virt-manager
@@ -264,9 +264,15 @@ def main():
 
     if show:
         def cb(conn):
-            ignore = conn
-            launch_specific_window(engine, show, options.uri, options.uuid)
-            return True
+            if conn.is_disconnected():
+                # Connection error
+                return True
+
+            if conn.is_active():
+                launch_specific_window(engine, show, options.uri, options.uuid)
+                return True
+
+            return False
         engine.uri_cb = cb
         engine.show_manager_window = False
         engine.skip_autostart = True
diff --git a/virtManager/engine.py b/virtManager/engine.py
index fa8322693..80edf2bca 100644
--- a/virtManager/engine.py
+++ b/virtManager/engine.py
@@ -135,7 +135,7 @@ class vmmEngine(vmmGObject):
             conn = self.make_conn(self.uri_at_startup)
             self.register_conn(conn, skip_config=True)
             if conn and self.uri_cb:
-                conn.connect_opt_out("resources-sampled", self.uri_cb)
+                conn.connect_opt_out("state-changed", self.uri_cb)
 
             self.connect_to_uri(self.uri_at_startup)