diff --git a/ChangeLog b/ChangeLog
index 17b28ab53c..9ceb279ab8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 14 16:47:12 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* panel-applet/NMWirelessAppletDbus.c
+	(nmwa_dbus_update_device_wireless_networks): remove warnings.
+
 Thu Oct 14 16:40:39 2004  Jonathan Blandford  <jrb@redhat.com>
 
 	* panel-applet/NMWirelessApplet.c (animation_timeout): Make
diff --git a/panel-applet/NMWirelessAppletDbus.c b/panel-applet/NMWirelessAppletDbus.c
index 67d960ff00..7feefa1e88 100644
--- a/panel-applet/NMWirelessAppletDbus.c
+++ b/panel-applet/NMWirelessAppletDbus.c
@@ -941,7 +941,9 @@ static void nmwa_dbus_update_device_wireless_networks (NetworkDevice *dev, NMWir
 	if (dev->type != DEVICE_TYPE_WIRELESS_ETHERNET)
 		goto out;
 
-	active_network = nmwa_dbus_get_active_network (applet, dev->nm_device, APPLET_STATE_IGNORE);
+	
+	if (dev->active)
+		active_network = nmwa_dbus_get_active_network (applet, dev->nm_device, APPLET_STATE_IGNORE);
 	if (applet->applet_state == APPLET_STATE_NO_NM)
 		goto out;	/* Don't proceed if NetworkManager died during the call to get the active network */