diff --git a/src/gui/src/ServerConfigDialog.cpp b/src/gui/src/ServerConfigDialog.cpp
index ce20f019f..00cf4e65a 100644
--- a/src/gui/src/ServerConfigDialog.cpp
+++ b/src/gui/src/ServerConfigDialog.cpp
@@ -19,10 +19,11 @@
 #include "ServerConfigDialog.h"
 #include "ui_ServerConfigDialog.h"
 
-#include "HotkeyDialog.h"
+#include "dialogs/ActionDialog.h"
+#include "dialogs/HotkeyDialog.h"
+
 #include "ScreenSettingsDialog.h"
 #include "ServerConfig.h"
-#include "dialogs/ActionDialog.h"
 
 #include <QFileDialog>
 #include <QMessageBox>
diff --git a/src/gui/src/HotkeyDialog.cpp b/src/gui/src/dialogs/HotkeyDialog.cpp
similarity index 100%
rename from src/gui/src/HotkeyDialog.cpp
rename to src/gui/src/dialogs/HotkeyDialog.cpp
diff --git a/src/gui/src/HotkeyDialog.h b/src/gui/src/dialogs/HotkeyDialog.h
similarity index 100%
rename from src/gui/src/HotkeyDialog.h
rename to src/gui/src/dialogs/HotkeyDialog.h
diff --git a/src/gui/src/HotkeyDialog.ui b/src/gui/src/dialogs/HotkeyDialog.ui
similarity index 100%
rename from src/gui/src/HotkeyDialog.ui
rename to src/gui/src/dialogs/HotkeyDialog.ui