diff --git a/themes/gitstatus/fish_prompt.fish b/themes/gitstatus/fish_prompt.fish
index 17e4b4c..e1b7a23 100644
--- a/themes/gitstatus/fish_prompt.fish
+++ b/themes/gitstatus/fish_prompt.fish
@@ -20,7 +20,7 @@ function _git_status_symbol
 end
 
 function _remote_hostname
-  if test $SSH_CONNECTION
+  if test -n "$SSH_CONNECTION"
     echo (whoami)@(hostname)
   end
 end
@@ -28,8 +28,13 @@ end
 function fish_prompt
   set -l cyan (set_color cyan)
   set -l normal (set_color normal)
-  set -l cwd (set_color $fish_color_cwd)(prompt_pwd)
 
-  echo -n (_remote_hostname) \
-          $cwd $cyan(_git_status_symbol)(_git_branch_name)$normal'> '
+  set -l cwd (set_color $fish_color_cwd)(prompt_pwd)
+  set -l git_status (_git_status_symbol)(_git_branch_name)
+
+  if test -n "$git_status"
+    set git_status " $git_status"
+  end
+
+  echo -n (_remote_hostname) $cwd$cyan$git_status$normal'> '
 end