diff --git a/functions/fish_prompt.fish b/functions/fish_prompt.fish
index 994513d3..f121ff2a 100644
--- a/functions/fish_prompt.fish
+++ b/functions/fish_prompt.fish
@@ -9,6 +9,7 @@ source (functions --details _tide_pwd)
 
 set -l prompt_var _tide_prompt_$fish_pid
 set -U $prompt_var # Set var here so if we erase $prompt_var, bg job won't set a uvar
+set -e _tide_repaint # Clear any repaint flag triggered by the set -U above
 
 set_color normal | read -l color_normal
 status fish-path | read -l fish_path
diff --git a/functions/tide/configure/choices/all/finish.fish b/functions/tide/configure/choices/all/finish.fish
index f670b1ed..e0f8ee52 100644
--- a/functions/tide/configure/choices/all/finish.fish
+++ b/functions/tide/configure/choices/all/finish.fish
@@ -1,21 +1,23 @@
 function finish
     _tide_title Finish
 
-    echo
+    set -q _flag_auto || echo
     set_color red
     _tide_option y 'Overwrite your current tide config'
     set_color normal
-    echo
+    set -q _flag_auto || echo
 
     _tide_option p 'Exit and print the config you just generated'
-    echo
+    set -q _flag_auto || echo
 
     _tide_menu (status function)
     switch $_tide_selected_option
         case 'Overwrite your current tide config'
             _tide_finish
-            command -q clear && clear
-            set -q _flag_auto || _tide_print_configure_current_options
+            set -q _flag_auto || begin
+                command -q clear && clear
+                _tide_print_configure_current_options
+            end
         case 'Exit and print the config you just generated'
             _tide_exit_configure
             command -q clear && clear