Index: shell/rb-shell.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/shell/rb-shell.c,v
retrieving revision 1.470
diff -u -p -r1.470 rb-shell.c
--- shell/rb-shell.c	10 Aug 2006 05:35:08 -0000	1.470
+++ shell/rb-shell.c	15 Aug 2006 10:20:57 -0000
@@ -1612,6 +1612,11 @@ rb_shell_window_delete_cb (GtkWidget *wi
 		return TRUE;
 	}
 
+	if (egg_tray_icon_have_manager (EGG_TRAY_ICON (shell->priv->tray_icon))) {
+		rb_shell_set_visibility (shell, FALSE, FALSE);
+		return TRUE;
+	}
+
 	rb_shell_quit (shell, NULL);
 
 	return TRUE;
