diff --git a/bin/.bin/folder-shell b/bin/.bin/folder-shell
index 700fe0de..3d15ea54 100755
--- a/bin/.bin/folder-shell
+++ b/bin/.bin/folder-shell
@@ -26,8 +26,11 @@ if [ -n "$PID" ]; then
 		CWD=$(readlink /proc/$PID/cwd)
 	fi
 fi
+current="$(project current --path)"
 if [ -n "$CWD" ]; then
 	cd "$CWD" && $CMD
+elif [ -n "$current" ]; then
+	cd "$current" && $CMD
 else
 	$CMD
 fi