diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish
index 55dfc3b..3da18d3 100644
--- a/fish/functions/fish_prompt.fish
+++ b/fish/functions/fish_prompt.fish
@@ -2,6 +2,13 @@ function fish_prompt --description 'Write out the prompt'
     # Save status code for previous command
     set -l last_status $status
 
+    # If we're running via SSH, display the hostname
+    if set -q SSH_TTY
+        set_color $fish_color_host_remote
+        echo -n "$hostname "
+        set_color normal
+    end
+
     # Print working directory
     set_color $fish_color_cwd
     echo -n (prompt_pwd)
diff --git a/fish/functions/fish_right_prompt.fish b/fish/functions/fish_right_prompt.fish
deleted file mode 100644
index e83e657..0000000
--- a/fish/functions/fish_right_prompt.fish
+++ /dev/null
@@ -1,8 +0,0 @@
-function fish_right_prompt --description 'Write out the right prompt'
-    # If we're running via SSH, display the hostname
-    if set -q SSH_TTY
-        set_color $fish_color_host_remote
-        echo -n $hostname
-        set_color normal
-    end
-end