diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 85cb946771..6a3e1d25d2 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -17,6 +17,7 @@
 #include <QLineEdit>
 #include <QPlainTextEdit>
 #include <QComboBox>
+#include <QScrollArea>
 
 #include "../../model/world/columnbase.hpp"
 #include "../../model/world/idtable.hpp"
@@ -264,9 +265,8 @@ CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSM
     const QModelIndex indexToFocus(model->getModelIndex (id.getId(), 0));
     const int focusedRow = indexToFocus.row();
 
-    QWidget *widget = new QWidget (this);
-
-    setWidget (widget);
+    QScrollArea *scrollArea = new QScrollArea(this);
+    QWidget *widget = new QWidget (scrollArea);
 
     QFrame* line = new QFrame(this);
     line->setObjectName(QString::fromUtf8("line"));
@@ -328,6 +328,11 @@ CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSM
     }
 
     mWidgetMapper->setCurrentModelIndex (indexToFocus);
+
+    scrollArea->setMinimumWidth(250);
+    scrollArea->setWidget(widget);
+    scrollArea->setWidgetResizable(true);
+    setWidget (scrollArea);
 }
 
 void CSVWorld::DialogueSubView::setEditLock (bool locked)
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index 766323d0b3..85d8392ffe 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -162,7 +162,10 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
         }
         if (display == CSMWorld::ColumnBase::Display_String ||
             display == CSMWorld::ColumnBase::Display_Skill ||
-            display == CSMWorld::ColumnBase::Display_Script)
+            display == CSMWorld::ColumnBase::Display_Script ||
+            display == CSMWorld::ColumnBase::Display_Race ||
+            display == CSMWorld::ColumnBase::Display_Class ||
+            display == CSMWorld::ColumnBase::Display_Faction)
         {
             return new QLineEdit(parent);
         }