diff --git a/src/main.sh b/src/main.sh
index 66a58c4..e27dd23 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -97,7 +97,8 @@ case "${1:-}" in
   mode=$2
   view=$3
   q="$(default_query "$view" "$FZF_KEY")"
-  printf "show-input+change-query(%s )" "$q"
+  [ "$q" ] && q="$q "
+  printf "show-input+change-query(%s)" "$q"
   [ "$mode" = "$MODE_NORMAL" ] && printf "+hide-input"
   exit 0
   ;;
@@ -192,7 +193,9 @@ case "${1:-}" in
   *) ;;
   esac
   # Set initial query
-  printf "show-input+change-query(%s )" "$(default_query "$view")"
+  q="$(default_query "$view")"
+  [ "$q" ] && q="$q "
+  printf "show-input+change-query(%s)" "$q"
   # Store current state
   printf "+change-border-label(%s)+change-list-label(%s)" "$view" "$mbid"
   # Set header