diff --git a/fish/functions/fish_right_prompt.fish b/fish/functions/fish_right_prompt.fish
index a70ee54..e83e657 100644
--- a/fish/functions/fish_right_prompt.fish
+++ b/fish/functions/fish_right_prompt.fish
@@ -1,11 +1,8 @@
 function fish_right_prompt --description 'Write out the right prompt'
-    # If we're running via SSH, change the host color
-    set --local color_host $fish_color_host
+    # If we're running via SSH, display the hostname
     if set -q SSH_TTY
-        set color_host $fish_color_host_remote
+        set_color $fish_color_host_remote
+        echo -n $hostname
+        set_color normal
     end
-
-    set_color $color_host
-    echo -n $hostname
-    set_color normal
 end