diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index 5ada1d84f..5bbedbf3d 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -116,6 +116,16 @@ void CSVWorld::CommandDelegate::setModelData (QWidget *editor, QAbstractItemMode
     ///< \todo provide some kind of feedback to the user, indicating that editing is currently not possible.
 }
 
+QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleOptionViewItem& option,
+    const QModelIndex& index) const
+{
+    if (!index.data().isValid())
+        return 0;
+
+    return QStyledItemDelegate::createEditor (parent, option, index);
+}
+
+
 void CSVWorld::CommandDelegate::setEditLock (bool locked)
 {
     mEditLock = locked;
diff --git a/apps/opencs/view/world/util.hpp b/apps/opencs/view/world/util.hpp
index 5334abf9c..95dfec6c5 100644
--- a/apps/opencs/view/world/util.hpp
+++ b/apps/opencs/view/world/util.hpp
@@ -99,6 +99,9 @@ namespace CSVWorld
             virtual void setModelData (QWidget *editor, QAbstractItemModel *model,
                 const QModelIndex& index) const;
 
+            virtual QWidget *createEditor (QWidget *parent, const QStyleOptionViewItem& option,
+                const QModelIndex& index) const;
+
             void setEditLock (bool locked);
 
             bool isEditLocked() const;