diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index f7c039f45..76c150b40 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -773,6 +773,9 @@ void register_code(uint8_t code)
     else if IS_CONSUMER(code) {
         host_consumer_send(KEYCODE2CONSUMER(code));
     }
+    else if IS_MOUSEKEY(code) {
+      mousekey_on(code);
+    }
 }
 
 /** \brief Utilities for actions. (FIXME: Needs better description)
@@ -832,6 +835,9 @@ void unregister_code(uint8_t code)
     else if IS_CONSUMER(code) {
         host_consumer_send(0);
     }
+    else if IS_MOUSEKEY(code) {
+      mousekey_off(code);
+    }
 }
 
 /** \brief Utilities for actions. (FIXME: Needs better description)