diff --git a/fish_prompt.fish b/fish_prompt.fish
index 4e7e2ee..8e2008c 100644
--- a/fish_prompt.fish
+++ b/fish_prompt.fish
@@ -182,10 +182,10 @@ function __bobthefish_finish_segments -S -d 'Close open prompt segments'
     set_color -b normal
     set_color $__bobthefish_current_bg
     echo -ns $__bobthefish_right_black_arrow_glyph ' '
-    set_color normal
   end
 
   set __bobthefish_current_bg
+  set_color normal
 end
 
 
diff --git a/fish_right_prompt.fish b/fish_right_prompt.fish
index bf46cb9..5f122b8 100644
--- a/fish_right_prompt.fish
+++ b/fish_right_prompt.fish
@@ -39,4 +39,5 @@ function fish_right_prompt -d 'bobthefish is all about the right prompt'
 
   __bobthefish_cmd_duration
   __bobthefish_timestamp
+  set_color normal
 end