diff --git a/bin/gvm-prompt b/bin/gvm-prompt
index c525b70..b953875 100755
--- a/bin/gvm-prompt
+++ b/bin/gvm-prompt
@@ -4,9 +4,10 @@ if [[ "$1" == "g" ]]; then
 elif [[ "$1" == "ps" ]]; then
 	echo $gvm_pkgset_name
 else
-	echo $gvm_go_name
 	if [[ $gvm_pkgset_name != "" ]]; then
-		echo "@$gvm_pkgset_name"
+		echo "$gvm_go_name@$gvm_pkgset_name"
+	else
+		echo $gvm_go_name
 	fi
 fi