diff --git a/functions/fish_prompt.fish b/functions/fish_prompt.fish
index 9f2d072..2a70a1b 100644
--- a/functions/fish_prompt.fish
+++ b/functions/fish_prompt.fish
@@ -19,8 +19,11 @@ function fish_prompt --description 'Informative prompt'
       set -l git_root_basename (basename "$git_root")
       set cwd (string replace --regex "^$git_root" "($git_root_basename)" "$cwd")
     end
-    printf '[%s] %s%s@%s %s%s %s%s%s%s%s \n> ' (date "+%H:%M:%S") (set_color brblue) \
-      $USER (prompt_hostname) (set_color $fish_color_cwd) $cwd $pipestatus_string \
-      (set_color yellow) (string trim -l (fish_git_prompt)) (set_color normal)
+    printf '[%s] %s%s@%s %s%s%s%s %s %s\n> ' (date "+%H:%M:%S") \
+      (set_color brblue) "$USER" (prompt_hostname) \
+      (set_color $fish_color_cwd) "$cwd" \
+      (set_color yellow) "$(fish_git_prompt)" \
+      "$pipestatus_string" \
+      (set_color normal)
   end
 end