diff --git a/ChangeLog b/ChangeLog
index 7a21142e50..e1efaa605a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-10  Dan Williams  <dcbw@redhat.com>
+
+	* gnome/applet/applet-dbus-info.c
+		- (nmi_dbus_get_network_key): hide the menu when putting up
+			the keyring dialog.  (not sure if the code is right...)
+
 2005-10-09  Dan Williams  <dcbw@redhat.com>
 
 	Patch from Bill Moss <bmoss@clemson.edu>
diff --git a/gnome/applet/applet-dbus-info.c b/gnome/applet/applet-dbus-info.c
index 2ec83e8107..3b83a030a6 100644
--- a/gnome/applet/applet-dbus-info.c
+++ b/gnome/applet/applet-dbus-info.c
@@ -95,6 +95,13 @@ static char *nmi_dbus_get_network_key (NMWirelessApplet *applet, const char *ess
 	g_return_val_if_fail (applet != NULL, NULL);
 	g_return_val_if_fail (essid != NULL, NULL);
 
+	/* If the menu happens to be showing when we pop up the
+	 * keyring dialog, we get an X server deadlock.  So deactivate
+	 * the menu here.
+	 */
+	if (applet->dropdown_menu && GTK_WIDGET_VISIBLE (GTK_WIDGET (applet->dropdown_menu)))
+		gtk_menu_shell_deactivate (GTK_MENU_SHELL (applet->dropdown_menu));
+
 	/* Get the essid key, if any, from the keyring */
 	ret = gnome_keyring_find_itemsv_sync (GNOME_KEYRING_ITEM_GENERIC_SECRET,
 								   &found_list,