diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index e56515d068..8a9f42d98a 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -318,10 +318,12 @@ namespace CSMWorld
 
             void assetTablesChanged();
 
-        private slots:
+        public slots:
 
             void assetsChanged();
 
+        private slots:
+
             void dataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
             void rowsChanged (const QModelIndex& parent, int start, int end);
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 31c8c1f274..ca32e5fc79 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -261,7 +261,7 @@ void CSVDoc::View::setupAssetsMenu()
     QMenu *assets = menuBar()->addMenu (tr ("Assets"));
 
     QAction* reload = createMenuEntry("Reload", ":./menu-reload.png", assets, "document-assets-reload");
-    connect (reload, SIGNAL (triggered()), &mDocument->getData(), SLOT (assetsChanged()));
+    connect (reload, &QAction::triggered, &mDocument->getData(), &CSMWorld::Data::assetsChanged);
 
     assets->addSeparator();
 
diff --git a/apps/opencs/view/world/genericcreator.hpp b/apps/opencs/view/world/genericcreator.hpp
index 90c5946ae5..9d394b9d13 100644
--- a/apps/opencs/view/world/genericcreator.hpp
+++ b/apps/opencs/view/world/genericcreator.hpp
@@ -118,13 +118,15 @@ namespace CSVWorld
             /// Focus main input widget
             void focus() override;
 
-        private slots:
-
-            void textChanged (const QString& text);
+        protected slots:
 
             /// \brief Create record if able to after Return key is pressed on input.
             void inputReturnPressed();
 
+        private slots:
+
+            void textChanged (const QString& text);
+
             void create();
 
             void scopeChanged (int index);
diff --git a/apps/opencs/view/world/infocreator.cpp b/apps/opencs/view/world/infocreator.cpp
index 6c3995477f..805e4111b9 100644
--- a/apps/opencs/view/world/infocreator.cpp
+++ b/apps/opencs/view/world/infocreator.cpp
@@ -85,7 +85,7 @@ CSVWorld::InfoCreator::InfoCreator (CSMWorld::Data& data, QUndoStack& undoStack,
     setManualEditing (false);
 
     connect (mTopic, &CSVWidget::DropLineEdit::textChanged, this, &InfoCreator::topicChanged);
-    connect (mTopic, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed()));
+    connect (mTopic, &CSVWidget::DropLineEdit::returnPressed, this, &InfoCreator::inputReturnPressed);
 }
 
 void CSVWorld::InfoCreator::cloneMode (const std::string& originId,
diff --git a/apps/opencs/view/world/pathgridcreator.cpp b/apps/opencs/view/world/pathgridcreator.cpp
index 5469ee9aba..a685fbb14c 100644
--- a/apps/opencs/view/world/pathgridcreator.cpp
+++ b/apps/opencs/view/world/pathgridcreator.cpp
@@ -43,7 +43,7 @@ CSVWorld::PathgridCreator::PathgridCreator(
     insertBeforeButtons(mCell, true);
 
     connect(mCell, &CSVWidget::DropLineEdit::textChanged, this, &PathgridCreator::cellChanged);
-    connect(mCell, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed()));
+    connect(mCell, &CSVWidget::DropLineEdit::returnPressed, this, &PathgridCreator::inputReturnPressed);
 }
 
 void CSVWorld::PathgridCreator::cloneMode(
diff --git a/apps/opencs/view/world/referencecreator.cpp b/apps/opencs/view/world/referencecreator.cpp
index 3ec356d6d4..62035e9117 100644
--- a/apps/opencs/view/world/referencecreator.cpp
+++ b/apps/opencs/view/world/referencecreator.cpp
@@ -44,7 +44,7 @@ CSVWorld::ReferenceCreator::ReferenceCreator (CSMWorld::Data& data, QUndoStack&
     setManualEditing (false);
 
     connect (mCell, &CSVWidget::DropLineEdit::textChanged, this, &ReferenceCreator::cellChanged);
-    connect (mCell, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed()));
+    connect (mCell, &CSVWidget::DropLineEdit::returnPressed, this, &ReferenceCreator::inputReturnPressed);
 }
 
 void CSVWorld::ReferenceCreator::reset()
diff --git a/apps/opencs/view/world/startscriptcreator.cpp b/apps/opencs/view/world/startscriptcreator.cpp
index cf662bc5ac..25b0301fb8 100644
--- a/apps/opencs/view/world/startscriptcreator.cpp
+++ b/apps/opencs/view/world/startscriptcreator.cpp
@@ -45,7 +45,7 @@ CSVWorld::StartScriptCreator::StartScriptCreator(
     insertBeforeButtons(mScript, true);
 
     connect(mScript, &CSVWidget::DropLineEdit::textChanged, this, &StartScriptCreator::scriptChanged);
-    connect(mScript, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed()));
+    connect(mScript, &CSVWidget::DropLineEdit::returnPressed, this, &StartScriptCreator::inputReturnPressed);
 }
 
 void CSVWorld::StartScriptCreator::cloneMode(