diff --git a/CHANGELOG.md b/CHANGELOG.md
index e561921c..2762d4d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,9 @@
 
 ## Unreleased
 ### Added
+
+* Unicode input mode now accepts input from the numpad as well, numlock is ignored.
+
 ### Changed
 
 * config: ARGB color values now default to opaque, rather than
diff --git a/unicode-mode.c b/unicode-mode.c
index a69601ec..6290de61 100644
--- a/unicode-mode.c
+++ b/unicode-mode.c
@@ -90,6 +90,8 @@ unicode_mode_input(struct seat *seat, struct terminal *term,
         /* 0-9, a-f, A-F */
         if (sym >= XKB_KEY_0 && sym <= XKB_KEY_9)
             digit = sym - XKB_KEY_0;
+        else if (sym >= XKB_KEY_KP_0 && sym <= XKB_KEY_KP_9)
+            digit = sym - XKB_KEY_KP_0;
         else if (sym >= XKB_KEY_a && sym <= XKB_KEY_f)
             digit = 0xa + (sym - XKB_KEY_a);
         else if (sym >= XKB_KEY_A && sym <= XKB_KEY_F)