diff --git a/conf.d/_tide_init.fish b/conf.d/_tide_init.fish
index b57aa09..544c219 100644
--- a/conf.d/_tide_init.fish
+++ b/conf.d/_tide_init.fish
@@ -1,8 +1,3 @@
-if status is-interactive && set -q _tide_version
-    _tide_detect_os
-    _tide_git_prompt_set_vars
-end
-
 function _tide_init_install --on-event _tide_init_install
     _set_immutable _tide_color_dark_blue 0087AF
     _set_immutable _tide_color_dark_green 5FAF00
diff --git a/functions/fish_prompt.fish b/functions/fish_prompt.fish
index 8961300..6ea6fab 100644
--- a/functions/fish_prompt.fish
+++ b/functions/fish_prompt.fish
@@ -1,3 +1,6 @@
+_tide_detect_os
+_tide_git_prompt_set_vars
+
 function fish_prompt
     fish --command "
     set -g _tide_last_pipestatus $pipestatus
@@ -12,7 +15,7 @@ function fish_prompt
     set -U _tide_left_prompt_display_$fish_pid (_tide_prompt)" &
 
     set -g _tide_last_pid (jobs --last --pid)
-    disown
+    disown $_tide_last_pid 2>/dev/null
 
     set -l displayVarName _tide_left_prompt_display_$fish_pid
     string unescape $$displayVarName