diff --git a/README.asciidoc b/README.asciidoc
index 687819f6..e7dab450 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -466,7 +466,9 @@ Commands
 When pressing `:` in normal mode, Kakoune will open a prompt to enter a command.
 
 Commands are used for non editing tasks, such as opening a buffer, writing the
-current one, quitting, etc.
+current one, quitting, etc. You can cycle through the command history with
+`<c-p>` and `<c-n>`. Commands starting with horizontal whitespace (e.g. a
+space) will not be saved in the command history.
 
 Basic Commands
 ~~~~~~~~~~~~~~
diff --git a/rc/man.kak b/rc/man.kak
index 95b9986a..957772a5 100644
--- a/rc/man.kak
+++ b/rc/man.kak
@@ -33,7 +33,14 @@ def -hidden -shell-params _man %{ %sh{
     fi
 } }
 
-def -shell-params man %{ %sh{
+def -shell-params \
+  -shell-completion %{
+    prefix=${1:0:${kak_pos_in_token}}
+    for page in /usr/share/man/*/${prefix}*.1.gz; do
+        basename $page .1.gz
+    done
+  } \
+  man %{ %sh{
     [ -z "$@" ] && set -- "$kak_selection"
     echo "eval -try-client %opt{docsclient} _man $@"
 } }
diff --git a/rc/sh.kak b/rc/sh.kak
index 26f98202..4d07c4b2 100644
--- a/rc/sh.kak
+++ b/rc/sh.kak
@@ -7,8 +7,8 @@ hook global BufSetOption mimetype=text/x-shellscript %{
 }
 
 addhl -group / regions -default code sh \
-    double_string  %{"} %{(?<!\\)(\\\\)*"} '' \
-    single_string %{'} %{(?<!\\)(\\\\)*'} '' \
+    double_string  %{(?<!\\)(\\\\)*\K"} %{(?<!\\)(\\\\)*"} '' \
+    single_string %{(?<!\\)(\\\\)*\K'} %{'} '' \
     comment '(?<!\$)#' '$' ''
 
 addhl -group /sh/double_string fill string
diff --git a/src/input_handler.cc b/src/input_handler.cc
index 5e11bfa6..30c14110 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -842,7 +842,7 @@ private:
 
     static void history_push(History& history, StringView entry)
     {
-        if(entry.empty())
+        if(entry.empty() or is_horizontal_blank(entry[0_byte]))
         {
             return;
         }
diff --git a/src/ncurses_ui.cc b/src/ncurses_ui.cc
index 60f62a64..1fc1f0d4 100644
--- a/src/ncurses_ui.cc
+++ b/src/ncurses_ui.cc
@@ -482,7 +482,7 @@ Key NCursesUI::get_key()
             auto wheel_down_mask = NCURSES_MOUSE_MASK(m_wheel_down_button, NCURSES_BUTTON_PRESSED);
             auto wheel_up_mask = NCURSES_MOUSE_MASK(m_wheel_up_button, NCURSES_BUTTON_PRESSED);
 
-            CharCoord pos{ ev.y, ev.x };
+            CharCoord pos{ ev.y - (m_status_on_top ? 1 : 0), ev.x };
             if ((ev.bstate & BUTTON1_PRESSED) == BUTTON1_PRESSED) return mouse_press(pos);
             if ((ev.bstate & BUTTON1_RELEASED) == BUTTON1_RELEASED) return mouse_release(pos);
             if ((ev.bstate & wheel_down_mask) == wheel_down_mask) return mouse_wheel_down(pos);