diff --git a/model/syncthingdevicemodel.cpp b/model/syncthingdevicemodel.cpp
index 396a697..6b90249 100644
--- a/model/syncthingdevicemodel.cpp
+++ b/model/syncthingdevicemodel.cpp
@@ -17,8 +17,6 @@ SyncthingDeviceModel::SyncthingDeviceModel(SyncthingConnection &connection, QObj
     : SyncthingModel(connection, parent)
     , m_devs(connection.devInfo())
 {
-    connect(&m_connection, &SyncthingConnection::newConfig, this, &SyncthingDeviceModel::newConfig);
-    connect(&m_connection, &SyncthingConnection::newDevices, this, &SyncthingDeviceModel::newDevices);
     connect(&m_connection, &SyncthingConnection::devStatusChanged, this, &SyncthingDeviceModel::devStatusChanged);
 }
 
@@ -288,16 +286,6 @@ int SyncthingDeviceModel::columnCount(const QModelIndex &parent) const
     }
 }
 
-void SyncthingDeviceModel::newConfig()
-{
-    beginResetModel();
-}
-
-void SyncthingDeviceModel::newDevices()
-{
-    endResetModel();
-}
-
 void SyncthingDeviceModel::devStatusChanged(const SyncthingDev &, int index)
 {
     const QModelIndex modelIndex1(this->index(index, 0, QModelIndex()));
diff --git a/model/syncthingdevicemodel.h b/model/syncthingdevicemodel.h
index 194ffa8..00e81ac 100644
--- a/model/syncthingdevicemodel.h
+++ b/model/syncthingdevicemodel.h
@@ -39,8 +39,6 @@ public Q_SLOTS:
     const SyncthingDev *devInfo(const QModelIndex &index) const;
 
 private Q_SLOTS:
-    void newConfig();
-    void newDevices();
     void devStatusChanged(const SyncthingDev &, int index);
 
 private:
diff --git a/model/syncthingdirectorymodel.cpp b/model/syncthingdirectorymodel.cpp
index 085f3ab..2df068b 100644
--- a/model/syncthingdirectorymodel.cpp
+++ b/model/syncthingdirectorymodel.cpp
@@ -19,8 +19,6 @@ SyncthingDirectoryModel::SyncthingDirectoryModel(SyncthingConnection &connection
     : SyncthingModel(connection, parent)
     , m_dirs(connection.dirInfo())
 {
-    connect(&m_connection, &SyncthingConnection::newConfig, this, &SyncthingDirectoryModel::newConfig);
-    connect(&m_connection, &SyncthingConnection::newDirs, this, &SyncthingDirectoryModel::newDirs);
     connect(&m_connection, &SyncthingConnection::dirStatusChanged, this, &SyncthingDirectoryModel::dirStatusChanged);
 }
 
@@ -349,16 +347,6 @@ int SyncthingDirectoryModel::columnCount(const QModelIndex &parent) const
     }
 }
 
-void SyncthingDirectoryModel::newConfig()
-{
-    beginResetModel();
-}
-
-void SyncthingDirectoryModel::newDirs()
-{
-    endResetModel();
-}
-
 void SyncthingDirectoryModel::dirStatusChanged(const SyncthingDir &, int index)
 {
     const QModelIndex modelIndex1(this->index(index, 0, QModelIndex()));
diff --git a/model/syncthingdirectorymodel.h b/model/syncthingdirectorymodel.h
index a728fe1..6a1e185 100644
--- a/model/syncthingdirectorymodel.h
+++ b/model/syncthingdirectorymodel.h
@@ -40,8 +40,6 @@ public Q_SLOTS:
     const SyncthingDir *dirInfo(const QModelIndex &index) const;
 
 private Q_SLOTS:
-    void newConfig();
-    void newDirs();
     void dirStatusChanged(const SyncthingDir &, int index);
 
 private:
diff --git a/model/syncthingdownloadmodel.cpp b/model/syncthingdownloadmodel.cpp
index 22c6c61..f54f455 100644
--- a/model/syncthingdownloadmodel.cpp
+++ b/model/syncthingdownloadmodel.cpp
@@ -29,8 +29,6 @@ SyncthingDownloadModel::SyncthingDownloadModel(SyncthingConnection &connection,
     , m_pendingDownloads(0)
     , m_singleColumnMode(true)
 {
-    connect(&m_connection, &SyncthingConnection::newConfig, this, &SyncthingDownloadModel::newConfig);
-    connect(&m_connection, &SyncthingConnection::newDirs, this, &SyncthingDownloadModel::newDirs);
     connect(&m_connection, &SyncthingConnection::downloadProgressChanged, this, &SyncthingDownloadModel::downloadProgressChanged);
 }
 
@@ -208,14 +206,14 @@ int SyncthingDownloadModel::columnCount(const QModelIndex &parent) const
     }
 }
 
-void SyncthingDownloadModel::newConfig()
+void SyncthingDownloadModel::handleConfigInvalidated()
 {
     beginResetModel();
     m_pendingDirs.clear();
     endResetModel();
 }
 
-void SyncthingDownloadModel::newDirs()
+void SyncthingDownloadModel::handleNewConfigAvailable()
 {
     m_pendingDirs.reserve(m_connection.dirInfo().size());
 }
diff --git a/model/syncthingdownloadmodel.h b/model/syncthingdownloadmodel.h
index cabea06..4c36a0d 100644
--- a/model/syncthingdownloadmodel.h
+++ b/model/syncthingdownloadmodel.h
@@ -41,8 +41,8 @@ Q_SIGNALS:
     void pendingDownloadsChanged(unsigned int pendingDownloads);
 
 private Q_SLOTS:
-    void newConfig();
-    void newDirs();
+    void handleConfigInvalidated() override;
+    void handleNewConfigAvailable() override;
     void downloadProgressChanged();
 
 private:
diff --git a/model/syncthingmodel.cpp b/model/syncthingmodel.cpp
index d51bf6c..e17a9cf 100644
--- a/model/syncthingmodel.cpp
+++ b/model/syncthingmodel.cpp
@@ -1,5 +1,7 @@
 #include "./syncthingmodel.h"
 
+#include "../connector/syncthingconnection.h"
+
 namespace Data {
 
 SyncthingModel::SyncthingModel(SyncthingConnection &connection, QObject *parent)
@@ -7,6 +9,8 @@ SyncthingModel::SyncthingModel(SyncthingConnection &connection, QObject *parent)
     , m_connection(connection)
     , m_brightColors(false)
 {
+    connect(&m_connection, &SyncthingConnection::newConfig, this, &SyncthingModel::handleConfigInvalidated);
+    connect(&m_connection, &SyncthingConnection::newConfigApplied, this, &SyncthingModel::handleNewConfigAvailable);
 }
 
 const QVector<int> &SyncthingModel::colorRoles() const
@@ -26,4 +30,14 @@ void SyncthingModel::setBrightColors(bool brightColors)
     }
 }
 
+void SyncthingModel::handleConfigInvalidated()
+{
+    beginResetModel();
+}
+
+void SyncthingModel::handleNewConfigAvailable()
+{
+    endResetModel();
+}
+
 } // namespace Data
diff --git a/model/syncthingmodel.h b/model/syncthingmodel.h
index 05733fc..a259b0c 100644
--- a/model/syncthingmodel.h
+++ b/model/syncthingmodel.h
@@ -24,6 +24,11 @@ public:
 protected:
     virtual const QVector<int> &colorRoles() const;
 
+private Q_SLOTS:
+    virtual void handleConfigInvalidated();
+    virtual void handleNewConfigAvailable();
+
+protected:
     Data::SyncthingConnection &m_connection;
     bool m_brightColors;
 };