diff --git a/qutebrowser/qutebrowser.conf b/qutebrowser/qutebrowser.conf
index 43e30ba5c..d99106b2d 100644
--- a/qutebrowser/qutebrowser.conf
+++ b/qutebrowser/qutebrowser.conf
@@ -16,6 +16,7 @@
 
 [general]
 # show_completion: bool, whether to show the autocompletion window or not.
+# completion_height: the height of the completion, in pixels
 # ignorecase: bool, whether to do case-insensitive searching.
 # wrapsearch: bool, whether to wrap search to the top when arriving at the end.
 # startpage: The default pages to open at the start, multiple pages can be
@@ -26,6 +27,7 @@
 #                 dns:        Use DNS matching (might be slow)
 #                 false:      Never search automatically
 show_completion = true
+completion_height = 400
 ignorecase = true
 wrapsearch = true
 startpage = http://www.duckduckgo.com/
diff --git a/qutebrowser/widgets/completion.py b/qutebrowser/widgets/completion.py
index f26953096..48d8107b1 100644
--- a/qutebrowser/widgets/completion.py
+++ b/qutebrowser/widgets/completion.py
@@ -94,7 +94,8 @@ class CompletionView(QTreeView):
 
     def __init__(self, parent=None):
         super().__init__(parent)
-        self._height = QPoint(0, 200)  # FIXME make that configurable
+        height = int(config.config.get('general', 'completion_height'))
+        self._height = QPoint(0, height)
         self._enabled = config.config.getboolean('general', 'show_completion')
         self._completion_models = {}
         self._completion_models[''] = None