diff --git a/include/binaries b/include/binaries
index 40fd62cb..7943736b 100644
--- a/include/binaries
+++ b/include/binaries
@@ -24,10 +24,12 @@
 #
 #################################################################################
 #
+    if [ ${CHECK_BINARIES} -eq 1 ]; then
     InsertSection "System Tools"
-#
-#################################################################################
-#
+    #
+    #################################################################################
+    #
+
     Display --indent 2 --text "- Scanning available tools..."
     logtext "Start scanning for available audit binaries and tools..."
 
@@ -69,7 +71,6 @@
 
                 if [ ${SKIPDIR} -eq 0 ]; then
                     logtext "Test: Checking binaries in directory ${SCANDIR}"
-                    Display --indent 4 --text "- ${SCANDIR}" --result FOUND --color GREEN
                     BINARY_PATHS_FOUND="${BINARY_PATHS_FOUND}, ${SCANDIR}"
                     logtext "Directory ${SCANDIR} exists. Starting directory scanning..."
                     FIND=`ls ${SCANDIR}`
@@ -191,10 +192,8 @@
                   else
                     logtext "Result: Directory ${SCANDIR} skipped"
                     if [ ! "${ORGPATH}" = "" ]; then TEXT="${ORGPATH} (links to ${SCANDIR})"; else TEXT="${SCANDIR}"; fi
-                    Display --indent 4 --text "- ${TEXT}" --result SKIPPED --color YELLOW
                 fi
               else
-                Display --indent 4 --text "- ${SCANDIR}" --result "NOT FOUND" --color WHITE
                 logtext "Result: Directory ${SCANDIR} does NOT exist"
             fi
             logtextbreak
@@ -207,11 +206,10 @@
 
     logtext "Result: found ${N} binaries"
     report "binaries_count=${N}"
-#
-#################################################################################
-#
 
-wait_for_keypress
+      else
+        logtext "Result: checking binaries skipped in this mode"
+    fi
 
 #
 #================================================================================