diff --git a/ChangeLog b/ChangeLog
index 91c006c4a3..d68e7e6bce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-25  Dan Williams <dcbw@redhat.com>
+
+	* panel-applet/NMWirelessApplet.c
+		- Set ESSID on a gconf trusted network too when force-setting the wireless
+			network to associate with
+
 2004-08-25  Dan Williams <dcbw@redhat.com>
 
 	* panel-applet/*
diff --git a/panel-applet/NMWirelessApplet.c b/panel-applet/NMWirelessApplet.c
index 05421e59a5..651f838123 100644
--- a/panel-applet/NMWirelessApplet.c
+++ b/panel-applet/NMWirelessApplet.c
@@ -396,6 +396,11 @@ void nmwa_handle_network_choice (NMWirelessApplet *applet, char *network)
 		key = g_strdup_printf ("%s/%s/timestamp", NM_GCONF_TRUSTED_NETWORKS_PATH, network);
 		gconf_client_set_int (applet->gconf_client, key, time (NULL), NULL);
 		g_free (key);
+
+		/* Force-set the essid too so that we have a semi-complete network entry */
+		key = g_strdup_printf ("%s/%s/essid", NM_GCONF_TRUSTED_NETWORKS_PATH, network);
+		gconf_client_set_string (applet->gconf_client, key, network, NULL);
+		g_free (key);
 	}
 	else
 	{