diff --git a/ChangeLog b/ChangeLog
index 1b8772d935..8ab56f661e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-19  Dan Williams <dcbw@redhat.com>
+
+    * src/NetworkManagerDevice.c
+        - (nm_device_wireless_process_scan_results): scan every 20s when
+            disconnected and scanning is ALWAYS_SCAN or WHEN_UNASSOCIATED
+
 2005-06-19  Dan Williams <dcbw@redhat.com>
 
     * WEXT_DEBUG->IOCTL_DEBUG, extend checking to all ioctl() calls
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index f685ac87f2..88d46624a8 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -3873,8 +3873,8 @@ static gboolean nm_device_wireless_process_scan_results (gpointer user_data)
 		g_slist_free (outdated_list);
 	}
 
-	/* If the list changed, decrease our wireless scanning interval */
-	if (list_changed)
+	/* If the list changed or we are unassociated, decrease our wireless scanning interval */
+	if (list_changed || !nm_device_is_activated (dev))
 		dev->options.wireless.scan_interval = 20;
 	else
 		dev->options.wireless.scan_interval = MIN (60, dev->options.wireless.scan_interval + 10);