diff --git a/man/termite.1 b/man/termite.1
index edc30a1..23e8b96 100644
--- a/man/termite.1
+++ b/man/termite.1
@@ -75,7 +75,7 @@ and the visual representation of the programs running within it. You can
 search, mark and copy contents from the display for use in other
 programs.
 .PP
-.IP "\fBescape\fP or \fBctrl-[\fP"
+.IP "\fBq\fP or \fBescape\fP or \fBctrl-[\fP"
 enter insert mode
 .IP "\fBx\fP"
 activate url hints mode
diff --git a/termite.cc b/termite.cc
index fc85408..584c8db 100644
--- a/termite.cc
+++ b/termite.cc
@@ -749,6 +749,7 @@ gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, keybind_info *info)
         }
         switch (event->keyval) {
             case GDK_KEY_Escape:
+            case GDK_KEY_q:
                 exit_command_mode(vte, &info->select);
                 gtk_widget_hide(info->panel.da);
                 gtk_widget_hide(info->panel.panel);