diff --git a/powerline/bindings/fish/powerline-setup.fish b/powerline/bindings/fish/powerline-setup.fish
index e4dc1ace..ee90c9fd 100644
--- a/powerline/bindings/fish/powerline-setup.fish
+++ b/powerline/bindings/fish/powerline-setup.fish
@@ -2,8 +2,10 @@ function powerline-setup
 	if test -z "$POWERLINE_COMMAND"
 		if which powerline-client >/dev/null
 			set -g -x POWERLINE_COMMAND powerline-client
-		else
+		else if which powerline >/dev/null
 			set -g -x POWERLINE_COMMAND powerline
+		else
+			set -g -x POWERLINE_COMMAND (dirname (status -f))/../../../scripts/powerline
 		end
 	end
 	function --on-variable POWERLINE_COMMAND _powerline_update