diff --git a/setup/so-whiptail b/setup/so-whiptail
index 926487f5b..09346828f 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -616,10 +616,14 @@ whiptail_end_settings() {
 		fi
 	fi
 
-	__append_end_msg ""
-	__append_end_msg "Press TAB to select yes or no."
+	local msg
+	read -r -d '' msg <<-EOM
+	$end_msg
 
-	whiptail --title "The following options have been set, would you like to proceed?" --yesno "$end_msg" 24 75 --scrolltext
+	Press TAB to select yes or no.
+	EOM
+
+	whiptail --title "The following options have been set, would you like to proceed?" --yesno "$msg" 24 75 --scrolltext
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus