diff --git a/apps/opencs/model/world/idtree.cpp b/apps/opencs/model/world/idtree.cpp
index 49ceced2c..eddde5a89 100644
--- a/apps/opencs/model/world/idtree.cpp
+++ b/apps/opencs/model/world/idtree.cpp
@@ -108,7 +108,19 @@ Qt::ItemFlags CSMWorld::IdTree::flags (const QModelIndex & index) const
     if (!index.isValid())
         return 0;
 
-    return IdTable::flags(index);
+    if (index.internalId() != 0)
+    {
+        std::pair<int, int> parentAddress(unfoldIndexAddress(index.internalId()));
+
+        Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+
+        if (mNestedCollection->getNestableColumn(parentAddress.second)->nestedColumn(index.column()).isEditable())
+            flags |= Qt::ItemIsEditable;
+
+        return flags;
+    }
+    else
+        return IdTable::flags(index);
 }
 
 bool CSMWorld::IdTree::removeRows (int row, int count, const QModelIndex& parent)
diff --git a/apps/opencs/model/world/nestedtableproxymodel.cpp b/apps/opencs/model/world/nestedtableproxymodel.cpp
index 7b35c88e4..0f137d78f 100644
--- a/apps/opencs/model/world/nestedtableproxymodel.cpp
+++ b/apps/opencs/model/world/nestedtableproxymodel.cpp
@@ -110,7 +110,7 @@ bool CSMWorld::NestedTableProxyModel::setData (const QModelIndex & index, const
 
 Qt::ItemFlags CSMWorld::NestedTableProxyModel::flags(const QModelIndex& index) const
 {
-    return mMainModel->flags(mMainModel->index(0, mParentColumn));
+    return mMainModel->flags(mapToSource(index));
 }
 
 std::string CSMWorld::NestedTableProxyModel::getParentId() const
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index b0f8a035a..f3b23100a 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -120,7 +120,7 @@ void CSVWorld::CommandDelegate::setModelDataImp (QWidget *editor, QAbstractItemM
 
     QVariant new_ = hack.getData();
 
-    if (model->data (index)!=new_)
+    if ((model->data (index)!=new_) && (model->flags(index) & Qt::ItemIsEditable))
         getUndoStack().push (new CSMWorld::ModifyCommand (*model, index, new_));
 }