diff --git a/docs/_summary.md b/docs/_summary.md
index 465f4657cd32..ea5e641471b9 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -53,6 +53,7 @@
   * [Command](feature_command.md)
   * [Dynamic Macros](feature_dynamic_macros.md)
   * [Grave Escape](feature_grave_esc.md)
+  * [Joystick](feature_joystick.md)
   * [Key Lock](feature_key_lock.md)
   * [Layouts](feature_layouts.md)
   * [Leader Key](feature_leader_key.md)
diff --git a/quantum/joystick.h b/quantum/joystick.h
index 985e2abc6231..6ca9ab887854 100644
--- a/quantum/joystick.h
+++ b/quantum/joystick.h
@@ -42,8 +42,6 @@ typedef struct {
 
 extern joystick_t joystick_status;
 
-//#define JS_INDEX(id, key) (key|((id & 0x7)<<6))
-
 //to be implemented in the hid protocol library
 void send_joystick_packet(joystick_t* joystick);
 
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index bc0374547dc2..39f82fefc88d 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -456,6 +456,7 @@ enum quantum_keycodes {
 
 #ifdef JOYSTICK_ENABLE
     JS_BUTTON0 = 0x5E00,
+    JS_BUTTON_MIN = JS_BUTTON0,
     JS_BUTTON1,
     JS_BUTTON2,
     JS_BUTTON3,