diff --git a/src/main/python/keycodes.py b/src/main/python/keycodes.py
index 12237cb..bc7f214 100644
--- a/src/main/python/keycodes.py
+++ b/src/main/python/keycodes.py
@@ -411,6 +411,25 @@ KEYCODES_MEDIA = [
     K(132, "KC_LSCR", "Locking\nScroll", "Locking Scroll Lock"),
 ]
 
+KEYCODES_USER = [
+    K(0x5F80, "USER00", "User 0", "User keycode 0"),
+    K(0x5F81, "USER01", "User 1", "User keycode 1"),
+    K(0x5F82, "USER02", "User 2", "User keycode 2"),
+    K(0x5F83, "USER03", "User 3", "User keycode 3"),
+    K(0x5F84, "USER04", "User 4", "User keycode 4"),
+    K(0x5F85, "USER05", "User 5", "User keycode 5"),
+    K(0x5F86, "USER06", "User 6", "User keycode 6"),
+    K(0x5F87, "USER07", "User 7", "User keycode 7"),
+    K(0x5F88, "USER08", "User 8", "User keycode 8"),
+    K(0x5F89, "USER09", "User 9", "User keycode 9"),
+    K(0x5F8A, "USER10", "User 10", "User keycode 10"),
+    K(0x5F8B, "USER11", "User 11", "User keycode 11"),
+    K(0x5F8C, "USER12", "User 12", "User keycode 12"),
+    K(0x5F8D, "USER13", "User 13", "User keycode 13"),
+    K(0x5F8E, "USER14", "User 14", "User keycode 14"),
+    K(0x5F8F, "USER15", "User 15", "User keycode 15"),
+]
+
 KEYCODES_MACRO = []
 
 KEYCODES = []
@@ -454,7 +473,7 @@ def recreate_keycodes():
 
     KEYCODES.clear()
     KEYCODES.extend(KEYCODES_SPECIAL + KEYCODES_BASIC + KEYCODES_SHIFTED + KEYCODES_ISO + KEYCODES_LAYERS +
-                    KEYCODES_QUANTUM + KEYCODES_BACKLIGHT + KEYCODES_MEDIA + KEYCODES_MACRO)
+                    KEYCODES_QUANTUM + KEYCODES_BACKLIGHT + KEYCODES_MEDIA + KEYCODES_MACRO + KEYCODES_USER)
 
 
 def recreate_keyboard_keycodes(keyboard):
diff --git a/src/main/python/tabbed_keycodes.py b/src/main/python/tabbed_keycodes.py
index 6b89876..cb42261 100644
--- a/src/main/python/tabbed_keycodes.py
+++ b/src/main/python/tabbed_keycodes.py
@@ -7,7 +7,7 @@ from PyQt5.QtGui import QPalette
 from constants import KEYCODE_BTN_RATIO
 from flowlayout import FlowLayout
 from keycodes import keycode_tooltip, KEYCODES_BASIC, KEYCODES_ISO, KEYCODES_MACRO, KEYCODES_LAYERS, KEYCODES_QUANTUM, \
-    KEYCODES_BACKLIGHT, KEYCODES_MEDIA, KEYCODES_SPECIAL, KEYCODES_SHIFTED
+    KEYCODES_BACKLIGHT, KEYCODES_MEDIA, KEYCODES_SPECIAL, KEYCODES_SHIFTED, KEYCODES_USER
 from keymaps import KEYMAPS
 from square_button import SquareButton
 from util import tr
@@ -28,6 +28,7 @@ class TabbedKeycodes(QTabWidget):
         self.tab_quantum = QScrollArea()
         self.tab_backlight = QScrollArea()
         self.tab_media = QScrollArea()
+        self.tab_user = QScrollArea()
         self.tab_macro = QScrollArea()
 
         self.widgets = []
@@ -39,6 +40,7 @@ class TabbedKeycodes(QTabWidget):
             (self.tab_quantum, "Quantum", KEYCODES_QUANTUM),
             (self.tab_backlight, "Backlight", KEYCODES_BACKLIGHT),
             (self.tab_media, "App, Media and Mouse", KEYCODES_MEDIA),
+            (self.tab_user, "User", KEYCODES_USER),
             (self.tab_macro, "Macro", KEYCODES_MACRO),
         ]:
             layout = FlowLayout()