diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index efbe77ccb..37d13223a 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -74,7 +74,7 @@ opencs_units_noqt (view/world
 
 opencs_units (view/widget
     scenetoolbar scenetool scenetoolmode pushbutton scenetooltoggle scenetoolrun modebutton
-    scenetooltoggle2
+    scenetooltoggle2 completerpopup
     )
 
 opencs_units (view/render
diff --git a/apps/opencs/model/world/idcompletionmanager.cpp b/apps/opencs/model/world/idcompletionmanager.cpp
index c9e135c83..c483a9fb5 100644
--- a/apps/opencs/model/world/idcompletionmanager.cpp
+++ b/apps/opencs/model/world/idcompletionmanager.cpp
@@ -4,6 +4,8 @@
 
 #include <QCompleter>
 
+#include "../../view/widget/completerpopup.hpp"
+
 #include "data.hpp"
 #include "idtablebase.hpp"
 
@@ -121,6 +123,11 @@ void CSMWorld::IdCompletionManager::generateCompleters(CSMWorld::Data &data)
                 // The completion role must be Qt::DisplayRole to get the ID values from the model
                 completer->setCompletionRole(Qt::DisplayRole);
                 completer->setCaseSensitivity(Qt::CaseInsensitive);
+
+                QAbstractItemView *popup = new CSVWidget::CompleterPopup();
+                completer->setPopup(popup); // The completer takes ownership of the popup
+                completer->setMaxVisibleItems(10);
+                
                 mCompleters[current->first] = completer;
             }
         }
diff --git a/apps/opencs/view/widget/completerpopup.cpp b/apps/opencs/view/widget/completerpopup.cpp
new file mode 100644
index 000000000..ad50b76e6
--- /dev/null
+++ b/apps/opencs/view/widget/completerpopup.cpp
@@ -0,0 +1,28 @@
+#include "completerpopup.hpp"
+
+CSVWidget::CompleterPopup::CompleterPopup(QWidget *parent)
+    : QListView(parent)
+{
+    setEditTriggers(QAbstractItemView::NoEditTriggers);
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setSelectionBehavior(QAbstractItemView::SelectRows);
+    setSelectionMode(QAbstractItemView::SingleSelection);
+}
+
+int CSVWidget::CompleterPopup::sizeHintForRow(int row) const
+{
+    if (model() == NULL)
+    {
+        return -1;
+    }
+    if (row < 0 || row >= model()->rowCount())
+    {
+        return -1;
+    }
+
+    ensurePolished();
+    QModelIndex index = model()->index(row, modelColumn());
+    QStyleOptionViewItem option = viewOptions();
+    QAbstractItemDelegate *delegate = itemDelegate(index);
+    return delegate->sizeHint(option, index).height();
+}
\ No newline at end of file
diff --git a/apps/opencs/view/widget/completerpopup.hpp b/apps/opencs/view/widget/completerpopup.hpp
new file mode 100644
index 000000000..92731ab50
--- /dev/null
+++ b/apps/opencs/view/widget/completerpopup.hpp
@@ -0,0 +1,17 @@
+#ifndef CSV_WIDGET_COMPLETERPOPUP_HPP
+#define CSV_WIDGET_COMPLETERPOPUP_HPP
+
+#include <QListView>
+
+namespace CSVWidget
+{
+    class CompleterPopup : public QListView
+    {
+        public:
+            CompleterPopup(QWidget *parent = 0);
+
+            virtual int sizeHintForRow(int row) const;
+    };
+}
+
+#endif
\ No newline at end of file