Index: config/fish/functions/fish_prompt.fish
==================================================================
--- config/fish/functions/fish_prompt.fish
+++ config/fish/functions/fish_prompt.fish
@@ -15,8 +15,8 @@
 		    (set_color $fish_color_vcs)"$branch" \
 		    (set_color $fish_color_vcs_braces)")"
 	end
 
 	echo -n -s (set_color $fish_color_host) (prompt_hostname) ' ' \
-	    (set_color $fish_color_cwd) (prompt_pwd) (string join "" $vcs) \
-	    (set_color $fish_color_suffix) "$suffix "
+	    (set_color $fish_color_cwd) (prompt_pwd) (string join '' $vcs) \
+	    (set_color $fish_color_suffix) $suffix (set_color normal) ' '
 end