diff --git a/.config/shell/server b/.config/shell/server
index 7e93091..a1bc45d 100644
--- a/.config/shell/server
+++ b/.config/shell/server
@@ -32,7 +32,7 @@ stack() {
 		#export GITLAB_CI="true"
 		echo Selected "$_cluster_name" with IP "$_cluster_ip"
 		echo "$_cluster_name" >"$_stackspin_cluster_cache"
-		builtin cd "$STACKSPIN"
+		test "$PWD" = "$HOME" && builtin cd "$STACKSPIN"
 		;;
 	(sso) builtin cd "$STACKSPIN"
 		"$0" exec dashboard --container backend -- flask "$@";;
diff --git a/.local/bin/scripts/git-get b/.local/bin/scripts/git-get
index f01e97e..bd10175 100755
--- a/.local/bin/scripts/git-get
+++ b/.local/bin/scripts/git-get
@@ -16,3 +16,4 @@ esac
 shift $(expr $# \& $# \< 3 \| 3)
 git clone $remote "$@" $dir --recurse-submodules
 cd "${dir:-${4:-$2}}"
+exec