diff --git a/CHANGES b/CHANGES
index 783da5bbd..03fad1cc4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ Bugs fixed
 
 * #3370: the caption of code-block is not picked up for translation
 * LaTeX: :confval:`release` is not escaped (refs: #3362)
+* #3364: sphinx-quickstart prompts overflow on Console with 80 chars width
 
 Testing
 --------
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index dda98ce5a..0bc6bd9f7 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -43,9 +43,6 @@ from sphinx.util import texescape
 
 TERM_ENCODING = getattr(sys.stdin, 'encoding', None)
 
-# function to get input from terminal -- overridden by the test suite
-term_input = input
-
 DEFAULT_VALUE = {
     'path': '.',
     'sep': False,
@@ -73,6 +70,12 @@ def mkdir_p(dir):
     os.makedirs(dir)
 
 
+# function to get input from terminal -- overridden by the test suite
+def term_input(prompt):
+    sys.stdout.write(prompt)
+    return input('')
+
+
 class ValidationError(Exception):
     """Raised for validation errors."""