diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt
index b93a6fc87..00ec8be56 100644
--- a/src/lib/common/CMakeLists.txt
+++ b/src/lib/common/CMakeLists.txt
@@ -15,6 +15,8 @@ add_library(common STATIC
   ExitCodes.h
   I18N.h
   I18N.cpp
+  KeySequence.h
+  KeySequence.cpp
   LogLevel.h
   NetworkProtocol.h
   PlatformInfo.h
diff --git a/src/lib/gui/KeySequence.cpp b/src/lib/common/KeySequence.cpp
similarity index 100%
rename from src/lib/gui/KeySequence.cpp
rename to src/lib/common/KeySequence.cpp
diff --git a/src/lib/gui/KeySequence.h b/src/lib/common/KeySequence.h
similarity index 100%
rename from src/lib/gui/KeySequence.h
rename to src/lib/common/KeySequence.h
diff --git a/src/lib/gui/Action.h b/src/lib/gui/Action.h
index a9158a494..12aec188d 100644
--- a/src/lib/gui/Action.h
+++ b/src/lib/gui/Action.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "KeySequence.h"
+#include "common/KeySequence.h"
 
 #include <QList>
 #include <QString>
diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt
index b0e096dcb..0fc4e503a 100644
--- a/src/lib/gui/CMakeLists.txt
+++ b/src/lib/gui/CMakeLists.txt
@@ -23,8 +23,6 @@ add_library(${target} STATIC
   FileTail.h
   Hotkey.cpp
   Hotkey.h
-  KeySequence.cpp
-  KeySequence.h
   Logger.cpp
   Logger.h
   MainWindow.cpp
diff --git a/src/lib/gui/Hotkey.h b/src/lib/gui/Hotkey.h
index f2ef223a3..458ebdb0c 100644
--- a/src/lib/gui/Hotkey.h
+++ b/src/lib/gui/Hotkey.h
@@ -13,7 +13,7 @@
 #include <QTextStream>
 
 #include "Action.h"
-#include "KeySequence.h"
+#include "common/KeySequence.h"
 
 class HotkeyDialog;
 class ServerConfigDialog;
diff --git a/src/lib/gui/dialogs/ActionDialog.cpp b/src/lib/gui/dialogs/ActionDialog.cpp
index 45c4c4b12..e8ba38413 100644
--- a/src/lib/gui/dialogs/ActionDialog.cpp
+++ b/src/lib/gui/dialogs/ActionDialog.cpp
@@ -11,7 +11,7 @@
 
 #include "Action.h"
 #include "Hotkey.h"
-#include "KeySequence.h"
+#include "common/KeySequence.h"
 #include "config/ServerConfig.h"
 
 #include <QTimer>
diff --git a/src/lib/gui/widgets/KeySequenceWidget.h b/src/lib/gui/widgets/KeySequenceWidget.h
index c123c97ee..bcb4206fe 100644
--- a/src/lib/gui/widgets/KeySequenceWidget.h
+++ b/src/lib/gui/widgets/KeySequenceWidget.h
@@ -9,7 +9,7 @@
 
 #include <QPushButton>
 
-#include "KeySequence.h"
+#include "common/KeySequence.h"
 
 class KeySequenceWidget : public QPushButton
 {
diff --git a/src/unittests/common/CMakeLists.txt b/src/unittests/common/CMakeLists.txt
index 12f66e599..7a2fd3f28 100644
--- a/src/unittests/common/CMakeLists.txt
+++ b/src/unittests/common/CMakeLists.txt
@@ -21,3 +21,10 @@ create_test(
   SOURCE I18NTests.cpp
   WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/lib/common"
 )
+
+create_test(
+  NAME KeySequenceTests
+  DEPENDS common
+  SOURCE KeySequenceTests.cpp
+  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/lib/common"
+)
diff --git a/src/unittests/gui/KeySequenceTests.cpp b/src/unittests/common/KeySequenceTests.cpp
similarity index 95%
rename from src/unittests/gui/KeySequenceTests.cpp
rename to src/unittests/common/KeySequenceTests.cpp
index bed84ed7f..2a88d3702 100644
--- a/src/unittests/gui/KeySequenceTests.cpp
+++ b/src/unittests/common/KeySequenceTests.cpp
@@ -6,7 +6,7 @@
 
 #include "KeySequenceTests.h"
 
-#include "gui/KeySequence.h"
+#include "common/KeySequence.h"
 
 void KeySequenceTests::toString_controlShiftPlus_usesNamedPlus()
 {
diff --git a/src/unittests/gui/KeySequenceTests.h b/src/unittests/common/KeySequenceTests.h
similarity index 100%
rename from src/unittests/gui/KeySequenceTests.h
rename to src/unittests/common/KeySequenceTests.h
diff --git a/src/unittests/gui/CMakeLists.txt b/src/unittests/gui/CMakeLists.txt
index 05241f2e5..871ed4b66 100644
--- a/src/unittests/gui/CMakeLists.txt
+++ b/src/unittests/gui/CMakeLists.txt
@@ -10,10 +10,3 @@ create_test(
   SOURCE LoggerTests.cpp
   WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/lib/gui"
 )
-
-create_test(
-  NAME KeySequenceTests
-  DEPENDS gui
-  SOURCE KeySequenceTests.cpp
-  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/lib/gui"
-)