diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index cb123688..23cb1643 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -1452,7 +1452,7 @@ GUI(){
 	done
 }
 if [ ${action-x} ]; then
-	if [[ "${noheader}" != *" ${action} "* ]] && [[ "${noheader}" != *" ${2} "* ]]; then
+	if [[ "${noheader}" != *" ${action} "* ]] && [[ "${noheader}" != *" ${2} "* ]] && [ "${2}" != "q" ]; then
 		DISP_HEADER
 	fi
 	case $action in
diff --git a/run.sh b/run.sh
index 1ccf5e0c..4b9962b8 100755
--- a/run.sh
+++ b/run.sh
@@ -11,7 +11,7 @@ fi
 source /opt/idssys/nodemgmt/defaults.inc
 
 if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]]; then
-	if [ "${1}" = "gui" ] && [ "${2}" != "q" ]; then
+	if [ "${1}" = "gui" ]; then
 		DISP_HEADER
 	fi
 	if [ "${1}" != "gui" ]; then