diff --git a/ChangeLog b/ChangeLog
index e7d92c5612..14f8310e38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-05  Dan Williams  <dcbw@redhat.com>
+
+	* libnm-glib/nm-client.c
+		- (constructor): get initial state after we know whether NM is running
+			or not
+
 2008-09-05  Dan Williams  <dcbw@redhat.com>
 
 	* libnm-glib/nm-ip4-config.c
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index fad65082bd..058f4584fd 100644
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -245,9 +245,6 @@ constructor (GType type,
 						    object,
 						    NULL);
 
-	update_wireless_status (NM_CLIENT (object), FALSE);
-	nm_client_get_state (NM_CLIENT (object));
-
 	priv->bus_proxy = dbus_g_proxy_new_for_name (connection,
 										"org.freedesktop.DBus",
 										"/org/freedesktop/DBus",
@@ -271,6 +268,11 @@ constructor (GType type,
 		g_error_free (err);
 	}
 
+	if (priv->manager_running) {
+		update_wireless_status (NM_CLIENT (object), FALSE);
+		nm_client_get_state (NM_CLIENT (object));
+	}
+
 	g_signal_connect (G_OBJECT (object), "notify::" NM_CLIENT_WIRELESS_ENABLED,
 	                  G_CALLBACK (wireless_enabled_cb), NULL);