diff --git a/ChangeLog b/ChangeLog
index d1bc5fa2cf..7a55f44a09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-16  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-device-802-11-wireless.c
+		- (nm_device_802_11_wireless_set_enabled): request a scan after enabling
+			wireless
+
 2008-05-14  Dan Williams  <dcbw@redhat.com>
 
 	Fix Linus' bug in rh #134886
diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index d74e9e8fb7..f41a4a5a87 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -3309,6 +3309,10 @@ nm_device_802_11_wireless_set_enabled (NMDevice80211Wireless *self, gboolean ena
 		if (enabled) {
 			nm_device_hw_bring_up (NM_DEVICE (self), TRUE);
 			nm_device_state_changed (NM_DEVICE (self), NM_DEVICE_STATE_DISCONNECTED);
+
+			/* Request a scan to get results immediately */
+			cancel_pending_scan (self);
+			request_wireless_scan (self);
 		} else {
 			nm_device_state_changed (NM_DEVICE (self), NM_DEVICE_STATE_UNAVAILABLE);
 			nm_device_hw_take_down (NM_DEVICE (self), TRUE);
@@ -3316,4 +3320,3 @@ nm_device_802_11_wireless_set_enabled (NMDevice80211Wireless *self, gboolean ena
 	}
 }
 
-