diff --git a/setup/so-setup b/setup/so-setup
index 1c46a8bf9..e9ad3a281 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -320,6 +320,9 @@ fi
 
 if [[ $is_manager && ! $is_eval ]]; then
 	whiptail_manager_adv
+	if [[ "$install_type" = 'MANAGER' ]] || [[ "$install_type" = 'MANAGERSEARCH' ]
+	whiptail_manager_adv_escluster
+	fi
 	whiptail_zeek_version
 	# Don't run this function for now since Snort is not yet supported
 	# whiptail_nids
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 78e66285b..437b2192c 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -631,7 +631,19 @@ whiptail_manager_adv_escluster(){
 	MGRCLUSTER=$(whiptail --title "Security Onion Setup" --yesno "Do you want to set up a traditional ES cluster?" 8 75)
 
 	local exitstatus=$?
-	whiptail_check_exitstatus $exitstatus
+
+	if [[ $exitstatus == 0 ]]; then
+	whiptail_manager_adv_escluster_name
+	fi
+}
+
+# Get a cluster name
+whiptail_manager_adv_escluster_name(){
+
+	[ -n "$TESTING" ] && return
+
+	ESCLUSTERNAME=$(whiptail --title "Security Onion Setup" --inputbox \
+		"Enter a name for your ES cluster!" 10 75 securityonion 3>&1 1>&2 2>&3)
 }
 
 # Ask which additional components to install