2 files changed, 15 insertions, 2 deletions
diff --git a/keyboards/moonlander/config.h b/keyboards/moonlander/config.h
index 459630a006..d49c33de8c 100644
--- a/keyboards/moonlander/config.h
+++ b/keyboards/moonlander/config.h
@@ -108,7 +108,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_DELAY              0
 #define MOUSEKEY_TIME_TO_MAX        60
 #define MOUSEKEY_MAX_SPEED          7
-#define MOUSEKEY_WHEEL_DELAY        MOUSEKEY_DELAY
+#define MOUSEKEY_WHEEL_DELAY        400
 #define MOUSEKEY_WHEEL_INTERVAL     MOUSEKEY_INTERVAL
 #define MOUSEKEY_WHEEL_MAX_SPEED    MOUSEKEY_MAX_SPEED
 #define MOUSEKEY_WHEEL_TIME_TO_MAX  MOUSEKEY_TIME_TO_MAX
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index 52cccc9727..42c119c2d9 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -128,7 +128,20 @@ void moonlander_led_task(void) {
         wait_ms(150);
     }
 #endif
-
+#ifdef CAPS_LOCK_STATUS
+    else {
+        led_t led_state = host_keyboard_led_state();
+        if(led_state.caps_lock) {
+            ML_LED_6(true);
+        }
+        else {
+            uint8_t layer = get_highest_layer(layer_state);
+            if(layer != 1) {
+                ML_LED_6(false);
+            }
+        }
+    }
+#endif
 }
 
 static THD_WORKING_AREA(waLEDThread, 128);