diff --git a/src/process-window.c b/src/process-window.c
index 4f85303..5d99de0 100644
--- a/src/process-window.c
+++ b/src/process-window.c
@@ -415,6 +415,10 @@ xtm_process_window_key_pressed (XtmProcessWindow *window, GdkEventKey *event)
 
 	if (event->keyval == GDK_KEY_Escape ||
 		(event->keyval == GDK_KEY_q && (event->state & GDK_CONTROL_MASK))) {
+		if (gtk_main_level () > 0) {
+			xtm_settings_save_settings(window->settings);
+			gtk_main_quit ();
+		}
 		ret = TRUE;
 	}
 	else if (event->keyval == GDK_KEY_f && (event->state & GDK_CONTROL_MASK)) {