diff --git a/src/frameserver/terminal/default/arcterm.c b/src/frameserver/terminal/default/arcterm.c
index 2a1feb4d5..d437dfdc6 100644
--- a/src/frameserver/terminal/default/arcterm.c
+++ b/src/frameserver/terminal/default/arcterm.c
@@ -612,7 +612,7 @@ static void on_mouse_button(struct tui_context* c,
 }
 
 static void on_key(struct tui_context* c, uint32_t keysym,
-	uint8_t scancode, uint8_t mods, uint16_t subid, void* t)
+	uint8_t scancode, uint16_t mods, uint16_t subid, void* t)
 {
 	trace("on_key(%"PRIu32",%"PRIu8",%"PRIu16")", keysym, scancode, subid);
 	if (term.pipe)
diff --git a/src/frameserver/terminal/default/st/tui.c b/src/frameserver/terminal/default/st/tui.c
index 641b7b7ac..d1f89a17b 100644
--- a/src/frameserver/terminal/default/st/tui.c
+++ b/src/frameserver/terminal/default/st/tui.c
@@ -267,7 +267,7 @@ static void on_mouse_button(
 }
 
 static void on_key(struct tui_context* c, uint32_t symest,
-	uint8_t scancode, uint8_t mods, uint16_t subid, void* t)
+	uint8_t scancode, uint16_t mods, uint16_t subid, void* t)
 {
 	char *str = NULL;
 	if (mods & TUIM_SHIFT){
diff --git a/src/shmif/arcan_tui.h b/src/shmif/arcan_tui.h
index 0127f9364..59e99ca43 100644
--- a/src/shmif/arcan_tui.h
+++ b/src/shmif/arcan_tui.h
@@ -339,7 +339,7 @@ struct tui_cbcfg {
  *
  */
 	void (*input_key)(struct tui_context*, uint32_t symest,
-		uint8_t scancode, uint8_t mods, uint16_t subid, void* tag);
+		uint8_t scancode, uint16_t mods, uint16_t subid, void* tag);
 
 /*
  * other input- that wasn't handled in the other callbacks
diff --git a/src/shmif/tui/lua/tui_lua.c b/src/shmif/tui/lua/tui_lua.c
index 522e86264..1a31e460c 100644
--- a/src/shmif/tui/lua/tui_lua.c
+++ b/src/shmif/tui/lua/tui_lua.c
@@ -432,7 +432,7 @@ static void on_mouse_button(struct tui_context* T,
 }
 
 static void on_key(struct tui_context* T, uint32_t xkeysym,
-	uint8_t scancode, uint8_t mods, uint16_t subid, void* t)
+	uint8_t scancode, uint16_t mods, uint16_t subid, void* t)
 {
 	SETUP_HREF("key",);
 		lua_pushnumber(L, subid);
diff --git a/src/shmif/tui/widgets/bufferwnd.c b/src/shmif/tui/widgets/bufferwnd.c
index 828a3c13d..a9b6e2680 100644
--- a/src/shmif/tui/widgets/bufferwnd.c
+++ b/src/shmif/tui/widgets/bufferwnd.c
@@ -1317,7 +1317,7 @@ static void step_cursor_e(struct tui_context* T, struct bufferwnd_meta* M)
 }
 
 static void on_key_input(struct tui_context* T, uint32_t keysym,
-	uint8_t scancode, uint8_t mods, uint16_t subid, void* tag)
+	uint8_t scancode, uint16_t mods, uint16_t subid, void* tag)
 {
 	struct bufferwnd_meta* M = tag;
 /* might want to provide the label based approach to these as well, UP/DOWN
diff --git a/src/shmif/tui/widgets/listwnd.c b/src/shmif/tui/widgets/listwnd.c
index 89922db7a..b72cb47d8 100644
--- a/src/shmif/tui/widgets/listwnd.c
+++ b/src/shmif/tui/widgets/listwnd.c
@@ -454,7 +454,7 @@ static bool on_label_input(
 }
 
 static void key_input(struct tui_context* T, uint32_t keysym,
-	uint8_t scancode, uint8_t mods, uint16_t subid, void* tag)
+	uint8_t scancode, uint16_t mods, uint16_t subid, void* tag)
 {
 	struct listwnd_meta* M = tag;
 	for (size_t i = 0; i < COUNT_OF(labels); i++){
diff --git a/src/shmif/tui/widgets/readline.c b/src/shmif/tui/widgets/readline.c
index 14502c9ba..9404ec40a 100644
--- a/src/shmif/tui/widgets/readline.c
+++ b/src/shmif/tui/widgets/readline.c
@@ -868,7 +868,7 @@ static void synch_completion(struct tui_context* T, struct readline_meta* M)
 }
 
 void on_key_input(struct tui_context* T,
-	uint32_t keysym, uint8_t scancode, uint8_t mods, uint16_t subid, void* tag)
+	uint32_t keysym, uint8_t scancode, uint16_t mods, uint16_t subid, void* tag)
 {
 	struct readline_meta* M;
 	if (!validate_context(T, &M))
diff --git a/tests/frameservers/tui_media/tui_media.c b/tests/frameservers/tui_media/tui_media.c
index 541deff21..8b93f6b25 100644
--- a/tests/frameservers/tui_media/tui_media.c
+++ b/tests/frameservers/tui_media/tui_media.c
@@ -31,7 +31,7 @@ static void fill(struct tui_context* c)
 }
 
 static void on_key(struct tui_context* c, uint32_t xkeysym,
-	uint8_t scancode, uint8_t mods, uint16_t subid, void* t)
+	uint8_t scancode, uint16_t mods, uint16_t subid, void* t)
 {
 	trace("unknown_key(%"PRIu32",%"PRIu8",%"PRIu16")", xkeysym, scancode, subid);
 /* FIXME: move subwindow around */
diff --git a/tests/frameservers/tui_test/tui_test.c b/tests/frameservers/tui_test/tui_test.c
index d947226eb..bc8f31369 100644
--- a/tests/frameservers/tui_test/tui_test.c
+++ b/tests/frameservers/tui_test/tui_test.c
@@ -212,7 +212,7 @@ static void on_mouse(struct tui_context* c,
 }
 
 static void on_key(struct tui_context* c, uint32_t xkeysym,
-	uint8_t scancode, uint8_t mods, uint16_t subid, void* t)
+	uint8_t scancode, uint16_t mods, uint16_t subid, void* t)
 {
 	trace("unknown_key(%"PRIu32",%"PRIu8",%"PRIu16")", xkeysym, scancode, subid);
 }
diff --git a/tests/frameservers/tui_text/tui_test.c b/tests/frameservers/tui_text/tui_test.c
index e2bce93ad..c17ffd6f3 100644
--- a/tests/frameservers/tui_text/tui_test.c
+++ b/tests/frameservers/tui_text/tui_test.c
@@ -84,7 +84,7 @@ static void on_mouse(struct tui_context* c,
 }
 
 static void on_key(struct tui_context* c, uint32_t keysym,
-	uint8_t scancode, uint8_t mods, uint16_t subid, void* t)
+	uint8_t scancode, uint16_t mods, uint16_t subid, void* t)
 {
 	trace("unknown_key(%"PRIu32",%"PRIu8",%"PRIu16")", keysym, scancode, subid);
 	struct data_buffer* T = t;