diff --git a/share/functions/__fish_paginate.fish b/share/functions/__fish_paginate.fish
index 95390ac53..848392b4e 100644
--- a/share/functions/__fish_paginate.fish
+++ b/share/functions/__fish_paginate.fish
@@ -5,9 +5,13 @@ function __fish_paginate -d "Paginate the current command using the users defaul
         set cmd $PAGER
     end
 
+    if test -z (commandline -j)
+        commandline -a $history[1]
+    end
+
     if commandline -j | string match -q -r -v "$cmd *\$"
 
-        commandline -aj " ^&1 |$cmd;"
+        commandline -aj " ^&1 | $cmd;"
     end
 
 end