3 files changed, 8 insertions, 2 deletions
diff --git a/lib/renderers/curses/curses.c b/lib/renderers/curses/curses.c
index 7923c93..6a7010d 100644
--- a/lib/renderers/curses/curses.c
+++ b/lib/renderers/curses/curses.c
@@ -297,6 +297,9 @@ poll_key(const struct bm_menu *menu, uint32_t *unicode)
         case 9: /* Tab */
             return BM_KEY_TAB;
 
+        case 353: /* S-Tab */
+            return BM_KEY_SHIFT_TAB;
+
         case 18: /* C-r */
             return BM_KEY_CONTROL_RETURN;
 
diff --git a/lib/renderers/wayland/registry.c b/lib/renderers/wayland/registry.c
index ab64a85..4e5e6dd 100644
--- a/lib/renderers/wayland/registry.c
+++ b/lib/renderers/wayland/registry.c
@@ -92,7 +92,7 @@ keyboard_handle_keymap(void *data, struct wl_keyboard *keyboard, uint32_t format
     input->xkb.state = state;
 
     for (uint32_t i = 0; i < MASK_LAST; ++i)
-        input->xkb.masks[i] = xkb_keymap_mod_get_index(input->xkb.keymap, BM_XKB_MASK_NAMES[i]);
+        input->xkb.masks[i] = 1 << xkb_keymap_mod_get_index(input->xkb.keymap, BM_XKB_MASK_NAMES[i]);
 }
 
 static void
diff --git a/lib/renderers/wayland/wayland.c b/lib/renderers/wayland/wayland.c
index 8967253..4325fa9 100644
--- a/lib/renderers/wayland/wayland.c
+++ b/lib/renderers/wayland/wayland.c
@@ -34,6 +34,9 @@ poll_key(const struct bm_menu *menu, unsigned int *unicode)
     uint32_t mods = wayland->input.modifiers;
     *unicode = xkb_state_key_get_utf32(wayland->input.xkb.state, wayland->input.code);
 
+    if (!*unicode && wayland->input.code == 23 && (mods & MOD_SHIFT))
+        return BM_KEY_SHIFT_TAB;
+
     switch (wayland->input.sym) {
         case XKB_KEY_Up:
             return BM_KEY_UP;
@@ -66,7 +69,7 @@ poll_key(const struct bm_menu *menu, unsigned int *unicode)
             return (mods & MOD_SHIFT ? BM_KEY_LINE_DELETE_LEFT : BM_KEY_DELETE);
 
         case XKB_KEY_Tab:
-            return BM_KEY_TAB;
+            return (mods & MOD_SHIFT ? BM_KEY_SHIFT_TAB : BM_KEY_TAB);
 
         case XKB_KEY_Insert:
             return BM_KEY_SHIFT_RETURN;