2 files changed, 7 insertions, 0 deletions

diff --git a/users/dshields/dshields.c b/users/dshields/dshields.c
index 8f432a317..13eab12d4 100644
--- a/users/dshields/dshields.c
+++ b/users/dshields/dshields.c
@@ -2,6 +2,11 @@
 #include "dshields.h"
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX)
+            || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)
+            || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
+        keycode = keycode & 0xFF;
+    }
     if (keycode == KC_ESC && record->event.pressed) {
         bool rc = true;
         uint8_t mods = 0;
diff --git a/users/dshields/dshields.h b/users/dshields/dshields.h
index e1aa07a5d..54268210c 100644
--- a/users/dshields/dshields.h
+++ b/users/dshields/dshields.h
@@ -15,6 +15,8 @@
 
 // mod-tap keys
 #define MT_SPC  SFT_T(KC_SPC)
+#define MT_BSPC SFT_T(KC_BSPC)
+#define MT_ESC  LGUI_T(KC_ESC)
 
 // LED/RGB controls
 #ifdef KEYBOARD_planck_light