diff --git a/setup/so-functions b/setup/so-functions
index 4e105dcd6..1c0cad2a7 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1883,7 +1883,7 @@ securityonion_repo() {
 		if [ -n "$(ls -A /etc/yum.repos.d/ 2>/dev/null)" ]; then
 			logCmd "mv -v /etc/yum.repos.d/* /root/oldrepos/"
 		fi
-		if [[ ! $is_desktop_grid ]]; then
+		if ! $is_desktop_grid; then
 			gpg_rpm_import
 			if [[ ! $is_airgap ]]; then
 				echo "https://repo.securityonion.net/file/so-repo/prod/2.4/oracle/9" > /etc/yum/mirror.txt
diff --git a/setup/so-setup b/setup/so-setup
index b946c06c8..61c0d88e3 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -333,38 +333,39 @@ if [[ $is_desktop ]]; then
 		exit 1
 	fi
 
-	if ! whiptail_desktop_install; then
-	if [[ $is_desktop_iso ]]; then
-		if whiptail_desktop_nongrid_iso; then
-			# Remove setup from auto launching
-			parse_install_username
-			sed -i '$ d' /home/$INSTALLUSERNAME/.bash_profile >> "$setup_log" 2>&1
-			securityonion_repo
-			info "Enabling graphical interface and setting it to load at boot"
-			systemctl set-default graphical.target
-			info "Setting desktop background"
-			set_desktop_background
-			echo "Desktop Install Complete!"
-			echo ""
-			echo "Please reboot to start graphical interface."
-			exit 0
+	whiptail_desktop_install
+	if ! is_desktop_grid; then
+		if [[ $is_desktop_iso ]]; then
+			if whiptail_desktop_nongrid_iso; then
+				# Remove setup from auto launching
+				parse_install_username
+				sed -i '$ d' /home/$INSTALLUSERNAME/.bash_profile >> "$setup_log" 2>&1
+				securityonion_repo
+				info "Enabling graphical interface and setting it to load at boot"
+				systemctl set-default graphical.target
+				info "Setting desktop background"
+				set_desktop_background
+				echo "Desktop Install Complete!"
+				echo ""
+				echo "Please reboot to start graphical interface."
+				exit 0
+			else
+				# Abort!
+				exit 0
+			fi
 		else
-			# Abort!
-			exit 0
+			if whiptail_desktop_nongrid_network; then
+				info ""
+				info ""
+				info "Kicking off the automated setup of the Security Onion Desktop. This can take a while depending on your network connection."
+				info ""
+				info ""
+				desktop_salt_local
+			else
+				# Abort!
+				exit 0
+			fi
 		fi
-	else
-		if whiptail_desktop_nongrid_network; then
-			info ""
-			info ""
-			info "Kicking off the automated setup of the Security Onion Desktop. This can take a while depending on your network connection."
-			info ""
-			info ""
-			desktop_salt_local
-		else
-			# Abort!
-			exit 0
-		fi
-	fi
 	fi
 
 	# If you got this far then you want to join the grid
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 62f60a84a..8fd3b5fdd 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -58,7 +58,11 @@ whiptail_desktop_install() {
 	whiptail --title "$whiptail_title" \
 		--yesno "$message" 11 75 --defaultno
 
-	is_desktop_grid=$?
+	if [ $? -eq 0 ]; then
+		is_desktop_grid=true
+	else
+		is_desktop_grid=false
+	fi
 
 }