diff --git a/keyboard/gh60/backlight.c b/keyboard/gh60/backlight.c
index 30dabea8..2f7a409a 100644
--- a/keyboard/gh60/backlight.c
+++ b/keyboard/gh60/backlight.c
@@ -51,13 +51,6 @@ static const uint8_t backlight_table[] PROGMEM = {
 void backlight_enable(void)
 {
 #ifdef SOFTPWM_LED_ENABLE
-#if defined(GH60_REV_CHN)
-    DDRB  |= (1<<PB6);
-    PORTB &= ~(1<<PB6);
-#else
-    DDRF  |= (1<<PF7 | 1<<PF6 | 1<<PF5 | 1<<PF4);
-    PORTF |= (1<<PF7 | 1<<PF6 | 1<<PF5 | 1<<PF4);
-#endif
     softpwm_led_enable();
 #else
 #if defined(GH60_REV_CHN)
@@ -85,11 +78,6 @@ void backlight_disable(void)
 {
 #ifdef SOFTPWM_LED_ENABLE
     softpwm_led_disable();
-#if defined(GH60_REV_CHN)
-    DDRB &= ~(1<<PB6);
-#else
-    DDRF &= ~(1<<PF7 | 1<<PF6 | 1<<PF5 | 1<<PF4);
-#endif
 #else
 #if defined(GH60_REV_CHN)
     // Turn off PWM
diff --git a/keyboard/gh60/ledmap.c b/keyboard/gh60/ledmap.c
index 178ebac2..50cf8630 100644
--- a/keyboard/gh60/ledmap.c
+++ b/keyboard/gh60/ledmap.c
@@ -8,7 +8,7 @@
 static const uint8_t ledmaps[LED_COUNT] PROGMEM = {
 #if defined(GH60_REV_CHN)
     [0] = LEDMAP_CAPS_LOCK | LEDMAP_BACKLIGHT,  // CapsLock - PB2
-    [1] = LEDMAP_BACKLIGHT,                     // PWM      - PB6
+    [1] = LEDMAP_LAYER(1) | LEDMAP_BACKLIGHT,   // PWM      - PB6
 #else
     [0] = LEDMAP_CAPS_LOCK | LEDMAP_BACKLIGHT,  // CapsLock - PB2
     [1] = LEDMAP_BACKLIGHT,                     // Esc      - GPIO1 - PF6