diff --git a/ChangeLog b/ChangeLog
index ac0d0eca75..da66723979 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-01  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-manager.c
+		- (impl_manager_activate_device): ensure the D-Bus method sends a return
+			value when the connection can be activated immediately
+
 2007-10-01  Dan Williams  <dcbw@redhat.com>
 
 	* libnm-glib/nm-device.c
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 4ef24a457b..1653422db8 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -955,7 +955,9 @@ impl_manager_activate_device (NMManager *manager,
 
 	connection = nm_manager_get_connection_by_object_path (manager, connection_type, connection_path);
 	if (connection) {
-		if (!nm_manager_activate_device (manager, device, connection, specific_object_path, TRUE)) {
+		if (nm_manager_activate_device (manager, device, connection, specific_object_path, TRUE)) {
+			dbus_g_method_return (context, TRUE);
+		} else {
 			err = nm_manager_error_new ("Error in device activation");
 			goto err;
 		}