diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 81d33b88..458feeae 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,15 +1,28 @@
-if status is-interactive
-
-    # source ~/.config/fish/custom_cd.fish
-
-    starship init fish | source
-    direnv hook fish | source
-    zoxide init fish | source
-    thefuck --alias | source
-    fzf --fish | source && fzf_configure_bindings
-    if test "$SSH_TTY"
-        set -gx COLORTERM truecolor
-        set -gx TERM xterm-256color
+if status is-login
+    if not set -q __sourced_profile
+        set -x __sourced_profile 1
+        exec bash -c "\
+            test -e /etc/profile && source /etc/profile
+            test -e $HOME/.bash_profile && source $HOME/.bash_profile
+            exec fish --login
+        "
     end
+
+    if status is-interactive
+
+        # source ~/.config/fish/custom_cd.fish
+
+        starship init fish | source
+        direnv hook fish | source
+        zoxide init fish | source
+        thefuck --alias | source
+        fzf --fish | source && fzf_configure_bindings
+        if test "$SSH_TTY"
+            set -gx COLORTERM truecolor
+            set -gx TERM xterm-256color
+        end
+    end
+    set -gx EDITOR kak
+
+    set -e __sourced_profile
 end
-set -gx EDITOR kak