diff --git a/share/functions/down-or-search.fish b/share/functions/down-or-search.fish
index 3f775bfbf..8bacfb4c7 100644
--- a/share/functions/down-or-search.fish
+++ b/share/functions/down-or-search.fish
@@ -9,7 +9,7 @@ function down-or-search -d "Depending on cursor position and current mode, eithe
 	# If we are on the bottom line, start search mode,
 	# otherwise move down
 	set lineno (commandline -L)
-	set line_count (commandline|wc -l)
+	set line_count (commandline | wc -l | tr -d ' ')
 
 	switch $lineno
 		case $line_count