diff --git a/ChangeLog b/ChangeLog
index af144eff34..bcf79d515a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-08  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Bill Moss
+	* panel-applet/NMWirelessApplet.c
+		- Restore correct ESSID in tooltips
+
 2005-02-07  Dan Williams  <dcbw@redhat.com>
 
 	* panel-applet/NMWirelessApplet.[ch]
diff --git a/panel-applet/NMWirelessApplet.c b/panel-applet/NMWirelessApplet.c
index ac89558627..e51276f907 100644
--- a/panel-applet/NMWirelessApplet.c
+++ b/panel-applet/NMWirelessApplet.c
@@ -306,7 +306,20 @@ nmwa_update_state (NMWirelessApplet *applet)
 	g_mutex_lock (applet->data_mutex);
 	if (    applet->active_device
 		&& (applet->active_device->type == DEVICE_TYPE_WIRELESS_ETHERNET))
+	{
+		GSList *list;
+
+		/* Grab a pointer the active network (for ESSID) */
+		for (list = applet->active_device->networks; list; list = list->next)
+		{
+			WirelessNetwork *network = (WirelessNetwork *) list->data;
+
+			if (network->active)
+				active_network = network;
+		}
+
 		strength = CLAMP ((int)applet->active_device->strength, 0, 100);
+	}
 
 #if 0
 	/* Only show icon if there's more than one device and at least one is wireless */