Index: uspace/app/gfxdemo/gfxdemo.c
===================================================================
--- uspace/app/gfxdemo/gfxdemo.c	(revision af967ef9e8932311192687a657ba22c6a8d92921)
+++ uspace/app/gfxdemo/gfxdemo.c	(revision f9ae472c64c5097b9b929d682dfdf69b3e00addc)
@@ -1205,8 +1205,29 @@
 }
 
+static void demo_kbd_event(kbd_event_t *event)
+{
+	if (event->type == KEY_PRESS) {
+		/* Ctrl-Q */
+		if ((event->mods & KM_CTRL) != 0 &&
+		    (event->mods & KM_ALT) == 0 &&
+		    (event->mods & KM_SHIFT) == 0 &&
+		    event->key == KC_Q) {
+			demo_quit();
+		}
+
+		/* Escape */
+		if ((event->mods & KM_CTRL) == 0 &&
+		    (event->mods & KM_ALT) == 0 &&
+		    (event->mods & KM_SHIFT) == 0 &&
+		    event->key == KC_ESCAPE) {
+			demo_quit();
+		}
+	}
+}
+
 static void wnd_kbd_event(void *arg, kbd_event_t *event)
 {
-	if (event->type == KEY_PRESS)
-		demo_quit();
+	(void)arg;
+	demo_kbd_event(event);
 }
 
@@ -1218,6 +1239,7 @@
 static void uiwnd_kbd_event(ui_window_t *window, void *arg, kbd_event_t *event)
 {
-	if (event->type == KEY_PRESS)
-		demo_quit();
+	(void)window;
+	(void)arg;
+	demo_kbd_event(event);
 }