diff --git a/fish/conf.d/composer.fish b/fish/conf.d/composer.fish
new file mode 100644
index 0000000..1b1a444
--- /dev/null
+++ b/fish/conf.d/composer.fish
@@ -0,0 +1 @@
+fish_add_path -a $HOME/.config/composer/vendor/bin
diff --git a/fish/conf.d/go.fish b/fish/conf.d/go.fish
new file mode 100644
index 0000000..47a7dfc
--- /dev/null
+++ b/fish/conf.d/go.fish
@@ -0,0 +1 @@
+fish_add_path (go env GOPATH)/bin
diff --git a/fish/config.fish b/fish/config.fish
index fbb6ca3..2dd3ad1 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -6,10 +6,6 @@ end
 set -g fish_greeting
 
 # Path stuff
-if command -q go
-    fish_add_path (go env GOPATH)/bin
-end
-
 fish_add_path $HOME/bin
 fish_add_path $HOME/.local/bin