diff -up gnome-keyring-2.29.4/daemon/dbus/gkd-dbus-session.c.bak gnome-keyring-2.29.4/daemon/dbus/gkd-dbus-session.c
--- gnome-keyring-2.29.4/daemon/dbus/gkd-dbus-session.c.bak	2009-12-15 04:31:36.000000000 +0100
+++ gnome-keyring-2.29.4/daemon/dbus/gkd-dbus-session.c	2009-12-22 14:44:45.000000000 +0100
@@ -130,7 +130,11 @@ signal_filter (DBusConnection *conn, DBu
 		unregister_daemon_in_session (conn);
 		gkd_main_quit ();
 		return DBUS_HANDLER_RESULT_HANDLED;
-	}
+	} else if (dbus_message_is_signal (msg, DBUS_INTERFACE_LOCAL, "Disconnected")) {
+		unregister_daemon_in_session (conn);
+		gkd_main_quit ();
+		return DBUS_HANDLER_RESULT_HANDLED;
+ 	}
 
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }