diff --git a/plugins/man/man.plugin.zsh b/plugins/man/man.plugin.zsh
index 94aa4918d..3ab15d323 100644
--- a/plugins/man/man.plugin.zsh
+++ b/plugins/man/man.plugin.zsh
@@ -13,8 +13,12 @@
 # ------------------------------------------------------------------------------
 
 man-command-line() {
-    [[ -z $BUFFER ]] && zle up-history
-    [[ $BUFFER != man\ * ]] && LBUFFER="man $LBUFFER"
+    # if there is no command typed, use the last command
+    [[ -z "$BUFFER" ]] && zle up-history
+
+    # prepend man to only the first part of the typed command
+    # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion-Flags
+    [[ "$BUFFER" != man\ * ]] && BUFFER="man ${${(Az)BUFFER}[1]}"
 }
 zle -N man-command-line
 # Defined shortcut keys: [Esc]man