diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index 9cfc0b293b..e6f2d9724f 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -151,7 +151,7 @@ namespace CSMWorld
 
         public:
 
-            DeleteNestedCommand (IdTable& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent);
+            DeleteNestedCommand (IdTable& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = 0);
 
             virtual void redo();
 
@@ -170,7 +170,7 @@ namespace CSMWorld
 
         public:
 
-            AddNestedCommand(IdTable& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent);
+            AddNestedCommand(IdTable& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = 0);
 
             virtual void redo();
 
diff --git a/apps/opencs/model/world/nestedtablemodel.cpp b/apps/opencs/model/world/nestedtablemodel.cpp
index 20fbd81e10..133520d1dd 100644
--- a/apps/opencs/model/world/nestedtablemodel.cpp
+++ b/apps/opencs/model/world/nestedtablemodel.cpp
@@ -91,3 +91,18 @@ Qt::ItemFlags CSMWorld::NestedTableModel::flags(const QModelIndex& index) const
 {
     return mMainModel->flags(mMainModel->index(0, mParentColumn));
 }
+
+std::string CSMWorld::NestedTableModel::getParentId() const
+{
+    return mId;
+}
+
+int CSMWorld::NestedTableModel::getParentColumn() const
+{
+    return mParentColumn;
+}
+
+CSMWorld::IdTable* CSMWorld::NestedTableModel::model() const
+{
+    return mMainModel;
+}
diff --git a/apps/opencs/model/world/nestedtablemodel.hpp b/apps/opencs/model/world/nestedtablemodel.hpp
index 0af261f4d6..18563b389d 100644
--- a/apps/opencs/model/world/nestedtablemodel.hpp
+++ b/apps/opencs/model/world/nestedtablemodel.hpp
@@ -31,6 +31,12 @@ namespace CSMWorld
                          IdTable* parentModel);
         //parent is the parent of columns to work with. Columnid provides information about the column
 
+        std::string getParentId() const;
+        
+        int getParentColumn() const;
+        
+        CSMWorld::IdTable* model() const;
+
         virtual QModelIndex mapFromSource(const QModelIndex& sourceIndex) const;
 
         virtual QModelIndex mapToSource(const QModelIndex& proxyIndex) const;
diff --git a/apps/opencs/view/world/nestedtable.cpp b/apps/opencs/view/world/nestedtable.cpp
index ffb1aaa47f..ebcce15d5b 100644
--- a/apps/opencs/view/world/nestedtable.cpp
+++ b/apps/opencs/view/world/nestedtable.cpp
@@ -1,16 +1,19 @@
 #include "nestedtable.hpp"
 #include "../../model/world/nestedtablemodel.hpp"
 #include "../../model/world/universalid.hpp"
+#include "../../model/world/commands.hpp"
 #include "util.hpp"
 
 #include <QHeaderView>
 #include <QContextMenuEvent>
+#include <QMenu>
 
 CSVWorld::NestedTable::NestedTable(QUndoStack& undoStack,
                                    CSMWorld::NestedTableModel* model,
                                    QWidget* parent)
     : QTableView(parent),
-      mUndoStack(undoStack)
+      mUndoStack(undoStack),
+      mModel(model)
 {
 
     setSelectionBehavior (QAbstractItemView::SelectRows);
@@ -34,7 +37,16 @@ CSVWorld::NestedTable::NestedTable(QUndoStack& undoStack,
     }
 
     setModel(model);
+
     setAcceptDrops(true);
+    
+    mAddNewRowAction = new QAction (tr ("Add new row"), this);
+    connect(mAddNewRowAction, SIGNAL(triggered()), 
+            this, SLOT(addNewRowActionTriggered()));
+    
+    mRemoveRowAction = new QAction (tr ("Remove row"), this);
+    connect(mRemoveRowAction, SIGNAL(triggered()),
+            this, SLOT(removeRowActionTriggered()));
 }
 
 void CSVWorld::NestedTable::dragEnterEvent(QDragEnterEvent *event)
@@ -48,4 +60,31 @@ void CSVWorld::NestedTable::dragMoveEvent(QDragMoveEvent *event)
 void CSVWorld::NestedTable::contextMenuEvent (QContextMenuEvent *event)
 {
     QModelIndexList selectedRows = selectionModel()->selectedRows();
+    
+    QMenu menu(this);
+
+    if (selectionModel()->selectedRows().size() == 1)
+        menu.addAction(mRemoveRowAction);
+
+    menu.addAction(mAddNewRowAction);
+    
+    menu.exec (event->globalPos());
+}
+
+void CSVWorld::NestedTable::removeRowActionTriggered()
+{
+    mUndoStack.push(new CSMWorld::DeleteNestedCommand(*(mModel->model()), 
+                                                      mModel->getParentId(), 
+                                                      selectionModel()->selectedRows().begin()->row(),
+                                                      mModel->getParentColumn()));
+                                                      
+}
+
+void CSVWorld::NestedTable::addNewRowActionTriggered()
+{
+    mUndoStack.push(new CSMWorld::AddNestedCommand(*(mModel->model()),
+                                                   mModel->getParentId(), 
+                                                   selectionModel()->selectedRows().size(),
+                                                   mModel->getParentColumn()));
+                                                      
 }
diff --git a/apps/opencs/view/world/nestedtable.hpp b/apps/opencs/view/world/nestedtable.hpp
index bdd3db3fa5..eb73cd885a 100644
--- a/apps/opencs/view/world/nestedtable.hpp
+++ b/apps/opencs/view/world/nestedtable.hpp
@@ -28,6 +28,7 @@ namespace CSVWorld
         QAction *mAddNewRowAction;
         QAction *mRemoveRowAction;
         QUndoStack& mUndoStack;
+        CSMWorld::NestedTableModel* mModel;
         
     public:
         NestedTable(QUndoStack& undoStack,
@@ -41,6 +42,16 @@ namespace CSVWorld
         
     private:
         void contextMenuEvent (QContextMenuEvent *event);
+        
+    private slots:
+        void removeRowActionTriggered();
+        
+        void addNewRowActionTriggered();
+        
+    signals:
+        void addNewRow();
+        
+        void removeRow(int row);
     };
 }