diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f13ede52..154f30161 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,8 +38,8 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
 
                 set(GIT_VERSION "${GIT_VERSION_MAJOR}.${GIT_VERSION_MINOR}.${GIT_VERSION_RELEASE}")
 
-#                 if(NOT ${OPENMW_VERSION} STREQUAL ${GIT_VERSION})
-#                     message(FATAL_ERROR "Silly Zini forgot to update the version again...")
+                if(NOT ${OPENMW_VERSION} STREQUAL ${GIT_VERSION})
+                    message(FATAL_ERROR "Silly Zini forgot to update the version again...")
                 else(NOT ${OPENMW_VERSION} STREQUAL ${GIT_VERSION})
                     set(OPENMW_VERSION_MAJOR ${GIT_VERSION_MAJOR})
                     set(OPENMW_VERSION_MINOR ${GIT_VERSION_MINOR})
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 6be5da635..492fa920f 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -447,7 +447,6 @@ CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSM
     connect(mEditWidget, SIGNAL(tableMimeDataDropped(QWidget*, const QModelIndex&, const CSMWorld::UniversalId&, const CSMDoc::Document*)), 
             this, SLOT(tableMimeDataDropped(QWidget*, const QModelIndex&, const CSMWorld::UniversalId&, const CSMDoc::Document*)));
 
-    mMainLayout->addLayout(buttonsLayout);
     mMainLayout->addWidget(mEditWidget);
     mEditWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
@@ -466,6 +465,7 @@ CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSM
     }
 
     dataChanged(mTable->index(mRow, 0));
+    mMainLayout->addLayout(buttonsLayout);
     setWidget(mainWidget);
 }