diff --git a/config/fish/functions/fish_prompt.fish b/config/fish/functions/fish_prompt.fish
index d7e7b63..adb9c54 100644
--- a/config/fish/functions/fish_prompt.fish
+++ b/config/fish/functions/fish_prompt.fish
@@ -17,6 +17,6 @@ function fish_prompt --description 'Write out the prompt'
 	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