diff --git a/src/gui/src/ScreenSetupView.cpp b/src/gui/src/ScreenSetupView.cpp
index 03beec010..464e68d9d 100644
--- a/src/gui/src/ScreenSetupView.cpp
+++ b/src/gui/src/ScreenSetupView.cpp
@@ -18,8 +18,8 @@
 
 #include "ScreenSetupView.h"
 
-#include "ScreenSettingsDialog.h"
 #include "ScreenSetupModel.h"
+#include "dialogs/ScreenSettingsDialog.h"
 
 #include <QDrag>
 #include <QDragEnterEvent>
diff --git a/src/gui/src/ServerConfigDialog.cpp b/src/gui/src/ServerConfigDialog.cpp
index 00cf4e65a..ced945291 100644
--- a/src/gui/src/ServerConfigDialog.cpp
+++ b/src/gui/src/ServerConfigDialog.cpp
@@ -21,8 +21,8 @@
 
 #include "dialogs/ActionDialog.h"
 #include "dialogs/HotkeyDialog.h"
+#include "dialogs/ScreenSettingsDialog.h"
 
-#include "ScreenSettingsDialog.h"
 #include "ServerConfig.h"
 
 #include <QFileDialog>
diff --git a/src/gui/src/ScreenSettingsDialog.cpp b/src/gui/src/dialogs/ScreenSettingsDialog.cpp
similarity index 100%
rename from src/gui/src/ScreenSettingsDialog.cpp
rename to src/gui/src/dialogs/ScreenSettingsDialog.cpp
diff --git a/src/gui/src/ScreenSettingsDialog.h b/src/gui/src/dialogs/ScreenSettingsDialog.h
similarity index 100%
rename from src/gui/src/ScreenSettingsDialog.h
rename to src/gui/src/dialogs/ScreenSettingsDialog.h
diff --git a/src/gui/src/ScreenSettingsDialog.ui b/src/gui/src/dialogs/ScreenSettingsDialog.ui
similarity index 100%
rename from src/gui/src/ScreenSettingsDialog.ui
rename to src/gui/src/dialogs/ScreenSettingsDialog.ui