diff --git a/lib/core/common.py b/lib/core/common.py
index 6c5099d67..ca63be94e 100755
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -43,6 +43,7 @@ from xml.dom import minidom
 from xml.sax import parse
 from xml.sax import SAXParseException
 
+from extra.beep.beep import beep
 from extra.cloak.cloak import decloak
 from extra.safe2bin.safe2bin import safecharencode
 from lib.core.bigarray import BigArray
@@ -931,6 +932,10 @@ def readInput(message, default=None, checkBatch=True):
             retVal = default
         else:
             logging._acquireLock()
+
+            if conf.get("beep"):
+                beep()
+
             dataToStdout("\r%s" % message, forceOutput=True, bold=True)
             kb.prependFlag = False
 
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 177cb063e..23add4a9d 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -689,7 +689,7 @@ def cmdLineParser():
                                   help="Set question answers (e.g. \"quit=N,follow=N\")")
 
         miscellaneous.add_option("--beep", dest="beep", action="store_true",
-                                  help="Make a beep sound when SQL injection is found")
+                                  help="Beep on question and/or when SQL injection is found")
 
         miscellaneous.add_option("--cleanup", dest="cleanup",
                                   action="store_true",
diff --git a/sqlmap.conf b/sqlmap.conf
index 2ca8c6dd6..d7db6c376 100644
--- a/sqlmap.conf
+++ b/sqlmap.conf
@@ -721,7 +721,7 @@ alert =
 # Set question answers (e.g. "quit=N,follow=N").
 answers =
 
-# Make a beep sound when SQL injection is found.
+# Beep on question and/or when SQL injection is found.
 # Valid: True or False
 beep = False