diff --git a/functions/fish_prompt.fish b/functions/fish_prompt.fish
index a9f0bdf..994513d 100644
--- a/functions/fish_prompt.fish
+++ b/functions/fish_prompt.fish
@@ -28,7 +28,7 @@ if contains newline $_tide_left_items # two line prompt initialization
     test "$tide_left_prompt_frame_enabled" = true &&
         set -l top_left_frame "$prompt_and_frame_color╭─" &&
         set -l bot_left_frame "$prompt_and_frame_color╰─" &&
-        set column_offset (math $column_offset-2)
+        set column_offset 3
     test "$tide_right_prompt_frame_enabled" = true &&
         set -l top_right_frame "$prompt_and_frame_color─╮" &&
         set -l bot_right_frame "$prompt_and_frame_color─╯" &&
@@ -145,9 +145,10 @@ end"
     end
 end
 
-eval "function _tide_on_fish_exit --on-event fish_exit
+# Inheriting instead of evaling because here load time is more important than runtime
+function _tide_on_fish_exit --on-event fish_exit --inherit-variable prompt_var
     set -e $prompt_var
-end"
+end
 
 if test "$tide_prompt_transient_enabled" = true
     function _tide_enter_transient