diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index 77da0139f22f..c6f3ffd7b216 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -1017,6 +1017,10 @@ void clear_keyboard_but_mods(void) {
  * FIXME: Needs documentation.
  */
 void clear_keyboard_but_mods_and_keys() {
+#ifdef EXTRAKEY_ENABLE
+    host_system_send(0);
+    host_consumer_send(0);
+#endif
     clear_weak_mods();
     clear_macro_mods();
     send_keyboard_report();
@@ -1024,10 +1028,6 @@ void clear_keyboard_but_mods_and_keys() {
     mousekey_clear();
     mousekey_send();
 #endif
-#ifdef EXTRAKEY_ENABLE
-    host_system_send(0);
-    host_consumer_send(0);
-#endif
 }
 
 /** \brief Utilities for actions. (FIXME: Needs better description)