diff --git a/ChangeLog b/ChangeLog
index 57c85656dd..1facec2188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-09-01  Christopher Aillon  <caillon@redhat.com>
 
+	* gnome/applet/applet.c:
+	Only show the "Stop/Start All Wireless Devices" menuitem
+	if we actually have wireless devices.
+
 	* gnome/applet/applet-dbus-info.c:
 	* gnome/applet/applet.c:
 	* gnome/applet/other-network-dialog.c:
diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c
index e2e61086e4..e2bdd201e2 100644
--- a/gnome/applet/applet.c
+++ b/gnome/applet/applet.c
@@ -2022,13 +2022,31 @@ static GtkWidget *nmwa_dropdown_menu_create (GtkMenuItem *parent, NMWirelessAppl
  */
 static void nmwa_context_menu_update (NMWirelessApplet *applet)
 {
-	GtkWidget *image;	
+	GtkWidget *image;
+	GSList *element;
+	gboolean have_wireless = FALSE;
 
 	g_return_if_fail (applet != NULL);
 	g_return_if_fail (applet->stop_wireless_item != NULL);
 
 	gtk_widget_destroy (applet->stop_wireless_item);
 
+	for (element = applet->device_list; element; element = element->next)
+	{
+		NetworkDevice *dev = (NetworkDevice *)(element->data);
+
+		g_assert (dev);
+
+		if (network_device_get_type (dev) == DEVICE_TYPE_WIRELESS_ETHERNET)
+		{
+			have_wireless = TRUE;
+			break;
+		}
+	}
+
+	if (!have_wireless)
+		return;
+
 	if (applet->wireless_enabled)
 	{
 		applet->stop_wireless_item = gtk_image_menu_item_new_with_mnemonic (_("_Stop All Wireless Devices"));