diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
index a52e04ab1..721dae28b 100644
--- a/shell/gnome-control-center.c
+++ b/shell/gnome-control-center.c
@@ -1114,6 +1114,11 @@ window_key_press_event (GtkWidget          *win,
             gtk_widget_grab_focus (self->priv->search_entry);
             retval = TRUE;
             break;
+          case GDK_KEY_Q:
+          case GDK_KEY_q:
+            g_object_unref (self);
+            retval = TRUE;
+            break;
         }
     }
   return retval;