diff --git a/src/lib/gui/dialogs/ServerConfigDialog.cpp b/src/lib/gui/dialogs/ServerConfigDialog.cpp
index e2af9750c..524e6ba1b 100644
--- a/src/lib/gui/dialogs/ServerConfigDialog.cpp
+++ b/src/lib/gui/dialogs/ServerConfigDialog.cpp
@@ -27,8 +27,8 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config)
       m_originalServerConfig(config),
       m_originalServerConfigIsExternal(config.useExternalConfig()),
       m_originalServerConfigUsesExternalFile(config.configFile()),
-      m_screenSetupModel(config.screens(), config.numColumns(), config.numRows()),
-      m_serverConfig(config)
+      m_serverConfig(config),
+      m_screenSetupModel(m_serverConfig.screens(), m_serverConfig.numColumns(), m_serverConfig.numRows())
 {
   ui->setupUi(this);
 
diff --git a/src/lib/gui/dialogs/ServerConfigDialog.h b/src/lib/gui/dialogs/ServerConfigDialog.h
index 9b41025d7..67a042b14 100644
--- a/src/lib/gui/dialogs/ServerConfigDialog.h
+++ b/src/lib/gui/dialogs/ServerConfigDialog.h
@@ -99,8 +99,8 @@ private:
   ServerConfig &m_originalServerConfig;
   bool m_originalServerConfigIsExternal;
   QString m_originalServerConfigUsesExternalFile;
-  ScreenSetupModel m_screenSetupModel;
   ServerConfig m_serverConfig;
+  ScreenSetupModel m_screenSetupModel;
 
 private Q_SLOTS:
   void onChange();