diff --git a/setup/so-setup b/setup/so-setup
index 9598a566a..f08a95415 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -97,7 +97,13 @@ if [[ $is_analyst ]]; then
 
     whiptail_analyst_install
 
-	exit 0
+	if [[ $AWORK != "Join" ]]; then
+	    # Lets make this a standalone
+		echo "Enabling X Windows and setting it to load at boot"
+		systemctl set-default graphical.target
+        startx
+		exit 0
+	fi
 
 	# If you got this far then you want to join the grid
 	is_minion=true
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 36d4493d8..9ecd00b04 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -44,9 +44,9 @@ whiptail_analyst_install() {
 	You can choose to join this workstation to an existing grid for managemnt or make it standalone.
 	EOM
 
-	whiptail --title "$whiptail_title" \
+	AWORK=$(whiptail --title "$whiptail_title" \
 		--yesno "$message" 11 75 \
-		--yes-button "Join" --no-button "Standalone" --defaultno
+		--yes-button "Join" --no-button "Standalone" --defaultno)
 
 }