3 files changed, 17 insertions, 1 deletions

diff --git a/keyboards/ergodox_ez/keymaps/drashna/keymap.c b/keyboards/ergodox_ez/keymaps/drashna/keymap.c
index 8743ae282..81231242d 100644
--- a/keyboards/ergodox_ez/keymaps/drashna/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/drashna/keymap.c
@@ -294,7 +294,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                 KC_I,       KC_O,       KC_NO,      KC_NO,      KC_NO,      KC_NO,
                 TG(_GAMEPAD),   KC_N,       KC_M,       KC_NO,      KC_NO,      KC_NO,      KC_NO,
                                             KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,      KC_NO,
-                KC_NO,          KC_NO,
+                KC_ASTG,          KC_NO,
                 KC_NO,
                 KC_PGDOWN,      KC_DELETE, KC_ENTER
             ),
diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c
index d096cde56..e2e6b02e0 100644
--- a/quantum/process_keycode/process_auto_shift.c
+++ b/quantum/process_keycode/process_auto_shift.c
@@ -34,6 +34,8 @@ uint16_t autoshift_time = 0;
 uint16_t autoshift_timeout = AUTO_SHIFT_TIMEOUT;
 uint16_t autoshift_lastkey = KC_NO;
 
+bool autoshift_enabled = true;
+
 void autoshift_timer_report(void) {
   char display[8];
 
@@ -84,6 +86,15 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
         autoshift_timer_report();
         return false;
 
+      case KC_ASTG:
+        if (autoshift_enabled) {
+          autoshift_enabled = false;
+          autoshift_flush();
+        }
+        else {
+          autoshift_enabled = true;
+        }
+
 #ifndef NO_AUTO_SHIFT_ALPHA
       case KC_A:
       case KC_B:
@@ -137,6 +148,8 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
       case KC_DOT:
       case KC_SLSH:
 #endif
+        if (!autoshift_enabled) return true;
+
         autoshift_flush();
 
         any_mod_pressed = get_mods() & (
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 453774d85..b0e555f2e 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -121,10 +121,13 @@ enum quantum_keycodes {
     KC_LEAD,
 #endif
 
+#ifdef AUTO_SHIFT_ENABLE
     // Auto Shift setup
     KC_ASUP,
     KC_ASDN,
     KC_ASRP,
+    KC_ASTG,
+#endif // AUTO_SHIFT_ENABLE
 
     // Audio on/off/toggle
     AU_ON,