diff --git a/src/lib/gui/dialogs/ServerConfigDialog.cpp b/src/lib/gui/dialogs/ServerConfigDialog.cpp
index ec66030a8..92fb3a31a 100644
--- a/src/lib/gui/dialogs/ServerConfigDialog.cpp
+++ b/src/lib/gui/dialogs/ServerConfigDialog.cpp
@@ -29,8 +29,8 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config)
       m_OriginalServerConfig(config),
       m_OriginalServerConfigIsExternal(config.useExternalConfig()),
       m_OriginalServerConfigUsesExternalFile(config.configFile()),
-      m_ServerConfig(config),
-      m_ScreenSetupModel(serverConfig().screens(), serverConfig().numColumns(), serverConfig().numRows())
+      m_ScreenSetupModel(config.screens(), config.numColumns(), config.numRows()),
+      m_ServerConfig(config)
 {
   ui->setupUi(this);
 
diff --git a/src/lib/gui/dialogs/ServerConfigDialog.h b/src/lib/gui/dialogs/ServerConfigDialog.h
index c0ae983b5..e1f14f884 100644
--- a/src/lib/gui/dialogs/ServerConfigDialog.h
+++ b/src/lib/gui/dialogs/ServerConfigDialog.h
@@ -95,12 +95,12 @@ protected:
 
 private:
   std::unique_ptr<Ui::ServerConfigDialog> ui;
+  QString m_Message = "";
   ServerConfig &m_OriginalServerConfig;
-  ServerConfig m_ServerConfig;
   bool m_OriginalServerConfigIsExternal;
   QString m_OriginalServerConfigUsesExternalFile;
   ScreenSetupModel m_ScreenSetupModel;
-  QString m_Message = "";
+  ServerConfig m_ServerConfig;
 
 private Q_SLOTS:
   void onChange();