diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt
index ad0b04eab..cad8ebcc5 100644
--- a/src/lib/common/CMakeLists.txt
+++ b/src/lib/common/CMakeLists.txt
@@ -15,6 +15,8 @@ add_library(common STATIC
   Coordinate.h
   Enums.h
   ExitCodes.h
+  Hotkey.cpp
+  Hotkey.h
   I18N.h
   I18N.cpp
   KeySequence.h
diff --git a/src/lib/gui/Hotkey.cpp b/src/lib/common/Hotkey.cpp
similarity index 100%
rename from src/lib/gui/Hotkey.cpp
rename to src/lib/common/Hotkey.cpp
diff --git a/src/lib/gui/Hotkey.h b/src/lib/common/Hotkey.h
similarity index 100%
rename from src/lib/gui/Hotkey.h
rename to src/lib/common/Hotkey.h
diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt
index e65179c84..7e3b5995f 100644
--- a/src/lib/gui/CMakeLists.txt
+++ b/src/lib/gui/CMakeLists.txt
@@ -19,8 +19,6 @@ add_library(${target} STATIC
   Diagnostic.h
   FileTail.cpp
   FileTail.h
-  Hotkey.cpp
-  Hotkey.h
   Logger.cpp
   Logger.h
   MainWindow.cpp
diff --git a/src/lib/gui/config/ServerConfig.cpp b/src/lib/gui/config/ServerConfig.cpp
index bd726655c..d50602e5c 100644
--- a/src/lib/gui/config/ServerConfig.cpp
+++ b/src/lib/gui/config/ServerConfig.cpp
@@ -8,7 +8,7 @@
 
 #include "ServerConfig.h"
 
-#include "Hotkey.h"
+#include "common/Hotkey.h"
 #include "common/Settings.h"
 
 #include <QAbstractButton>
diff --git a/src/lib/gui/config/ServerConfig.h b/src/lib/gui/config/ServerConfig.h
index 9e3d1fd04..c25fa4c73 100644
--- a/src/lib/gui/config/ServerConfig.h
+++ b/src/lib/gui/config/ServerConfig.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "common/Constants.h"
-#include "gui/Hotkey.h"
+#include "common/Hotkey.h"
 #include "gui/config/ScreenConfig.h"
 #include "gui/config/ScreenList.h"
 
diff --git a/src/lib/gui/dialogs/ActionDialog.cpp b/src/lib/gui/dialogs/ActionDialog.cpp
index d8a9d3f09..b3bf3423b 100644
--- a/src/lib/gui/dialogs/ActionDialog.cpp
+++ b/src/lib/gui/dialogs/ActionDialog.cpp
@@ -9,8 +9,8 @@
 #include "ActionDialog.h"
 #include "ui_ActionDialog.h"
 
-#include "Hotkey.h"
 #include "common/Action.h"
+#include "common/Hotkey.h"
 #include "common/KeySequence.h"
 #include "config/ServerConfig.h"
 
diff --git a/src/lib/gui/dialogs/HotkeyDialog.h b/src/lib/gui/dialogs/HotkeyDialog.h
index 02f7541ee..2e403b6ed 100644
--- a/src/lib/gui/dialogs/HotkeyDialog.h
+++ b/src/lib/gui/dialogs/HotkeyDialog.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Hotkey.h"
+#include "common/Hotkey.h"
 
 #include <QDialog>