diff --git a/keyboards/moonlander/keymaps/default/keymap.c b/keyboards/moonlander/keymaps/default/keymap.c
index 3db5086b40..338a91cf19 100644
--- a/keyboards/moonlander/keymaps/default/keymap.c
+++ b/keyboards/moonlander/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_DEL,
   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
           KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_ENT,
-                  KC_RALT,KC_LGUI,KC_LALT,KC_LCTL,MO(1),
+                  KC_RALT,KC_LGUI,KC_LALT,KC_LCTL,MO(2),
                                    KC_ENT,KC_SPC, KC_BSPC
 ),
 
@@ -47,7 +47,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_DEL,
   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
           KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,
-                  KC_RALT,KC_LGUI,KC_LALT,KC_LCTL,MO(1),
+                  KC_RALT,KC_LGUI,KC_LALT,KC_LCTL,MO(2),
+                                   KC_ENT,KC_SPC, KC_BSPC
+),
+
+[1] = LAYOUT_moonlander(
+  KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,
+  KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,
+  KC_ESC, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,
+  KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,
+  MO(1),KC_LCTL,KC_LALT,KC_LGUI,KC_RALT,
+  KC_BSPC,KC_SPC, KC_ENT,
+
+  KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_BSPC,
+  KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_DEL,
+  KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
+          KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,
+                  KC_RALT,KC_LGUI,KC_LALT,KC_LCTL,MO(2),
                                    KC_ENT,KC_SPC, KC_BSPC
 )
 
diff --git a/keyboards/moonlander/matrix.c b/keyboards/moonlander/matrix.c
index ab7e9bb6c3..9b37c31e14 100644
--- a/keyboards/moonlander/matrix.c
+++ b/keyboards/moonlander/matrix.c
@@ -217,7 +217,6 @@ uint8_t matrix_scan(void) {
             debouncing_right = true;
             debouncing_time_right = timer_read();
         }
-
     }
 
 
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index d000ee8814..cca55e0c5b 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -55,6 +55,7 @@ uint32_t layer_state_set_kb(uint32_t state) {
         break;
       case 2:
         ML_LED_2(1);
+        ML_LED_5(1);
         break;
       case 3:
         ML_LED_3(1);