diff --git a/rc/tools/man.kak b/rc/tools/man.kak
index 5e57dc069..facfaedf1 100644
--- a/rc/tools/man.kak
+++ b/rc/tools/man.kak
@@ -108,8 +108,12 @@ declare-option -hidden regex man_link2 \
 # Define a useful command sequence for searching a given regex
 # and a given sequence of search keys.
 define-command man-search -params 2 %{
-  set-register / %arg[1]
-  execute-keys %arg[2]
+    set-register / %arg[1]
+    try %{
+        execute-keys %arg[2]
+    } catch %{
+        fail "Could not find man page link"
+    }
 }
 
 define-command -docstring 'Go to next man page link' \
@@ -135,13 +139,9 @@ man-jump %{
 }
 
 # Suggested keymaps for a user mode
-declare-user-mode man-mode
+declare-user-mode man
 
-define-command man-mode-map -params 3 %{
-  map global man-mode %arg[1] %arg[2] -docstring %arg[3]
-} -hidden
-
-man-mode-map 'g' ': man-jump<ret>' 'Jump to a man page using selected man page link'
-man-mode-map 'j' ': try %{ man-link-next }<ret>' 'Go to next man page link'
-man-mode-map 'k' ': try %{ man-link-prev }<ret>' 'Go to previous man page link'
-man-mode-map 'm' ': man<space>' 'Look up a man page'
+map global man 'g' -docstring 'Jump to a man page using selected man page link' ': man-jump<ret>'
+map global man 'j' -docstring 'Go to next man page link'                        ': man-link-next<ret>'
+map global man 'k' -docstring 'Go to previous man page link'                    ': man-link-prev<ret>'
+map global man 'm' -docstring 'Look up a man page'                              ':man<space>'