diff --git a/ChangeLog b/ChangeLog
index c7904097f3..06a3af3ae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 22 14:19:48 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* panel-applet/NMWirelessApplet.c: Only add essid's if we actually
+	have a wireless card.
+
 Wed Sep 22 14:05:48 2004  Jonathan Blandford  <jrb@redhat.com>
 
 	* panel-applet/NMWirelessApplet.c: move the custom essid item.
diff --git a/panel-applet/NMWirelessApplet.c b/panel-applet/NMWirelessApplet.c
index 6d2b5ba64b..38bd8f81dc 100644
--- a/panel-applet/NMWirelessApplet.c
+++ b/panel-applet/NMWirelessApplet.c
@@ -756,8 +756,9 @@ static void nmwa_menu_add_devices (GtkWidget *menu, NMWirelessApplet *applet)
 		}
 	}
 
-	/* Add the 'Select a custom esssid entry */
-	nmwa_menu_add_custom_essid_item (menu, applet);
+	if (n_wireless_interfaces > 0)
+		/* Add the 'Select a custom esssid entry */
+		nmwa_menu_add_custom_essid_item (menu, applet);
 
 	g_mutex_unlock (applet->data_mutex);
 }