Merge remote-tracking branch 'upstream/develop'

1 files changed, 6 insertions, 2 deletions

diff --git a/quantum/process_keycode/process_autocorrect.c b/quantum/process_keycode/process_autocorrect.c
index 8aeebf0e06..1376788266 100644
--- a/quantum/process_keycode/process_autocorrect.c
+++ b/quantum/process_keycode/process_autocorrect.c
@@ -126,9 +126,13 @@ __attribute__((weak)) bool process_autocorrect_user(uint16_t *keycode, keyrecord
         // and mask for base keycode when they are tapped.
         case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX:
 #ifdef SWAP_HANDS_ENABLE
-            // Note: IS_SWAP_HANDS_KEYCODE() actually tests for the special action keycodes like SH_TG, SH_TT, ...,
+            // Note: IS_SWAP_HANDS_KEYCODE() actually tests for the special action keycodes like SH_TOGG, SH_TT, ...,
             // which currently overlap the SH_T(kc) range.
-            if (IS_SWAP_HANDS_KEYCODE(*keycode) || !record->tap.count) {
+            if (IS_SWAP_HANDS_KEYCODE(*keycode)
+#    ifndef NO_ACTION_TAPPING
+                || !record->tap.count
+#    endif // NO_ACTION_TAPPING
+            ) {
                 return false;
             }
             *keycode = QK_SWAP_HANDS_GET_TAP_KEYCODE(*keycode);