diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 1cd0a40a3..ef5795772 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -19,10 +19,11 @@
 #include "MainWindow.h"
 #include "ui_MainWindow.h"
 
-#include "ServerConfigDialog.h"
-#include "common/constants.h"
 #include "dialogs/AboutDialog.h"
+#include "dialogs/ServerConfigDialog.h"
 #include "dialogs/SettingsDialog.h"
+
+#include "common/constants.h"
 #include "gui/Logger.h"
 #include "gui/config/ConfigScopes.h"
 #include "gui/constants.h"
diff --git a/src/gui/src/ServerConfigDialog.cpp b/src/gui/src/dialogs/ServerConfigDialog.cpp
similarity index 100%
rename from src/gui/src/ServerConfigDialog.cpp
rename to src/gui/src/dialogs/ServerConfigDialog.cpp
diff --git a/src/gui/src/ServerConfigDialog.h b/src/gui/src/dialogs/ServerConfigDialog.h
similarity index 100%
rename from src/gui/src/ServerConfigDialog.h
rename to src/gui/src/dialogs/ServerConfigDialog.h
diff --git a/src/gui/src/ServerConfigDialog.ui b/src/gui/src/dialogs/ServerConfigDialog.ui
similarity index 100%
rename from src/gui/src/ServerConfigDialog.ui
rename to src/gui/src/dialogs/ServerConfigDialog.ui