diff --git a/keyboards/framework/matrix.c b/keyboards/framework/matrix.c
index 7abad4c2b0..5e713d802c 100644
--- a/keyboards/framework/matrix.c
+++ b/keyboards/framework/matrix.c
@@ -270,7 +270,7 @@ bool handle_idle(void) {
     }
 #endif
 #ifdef BACKLIGHT_ENABLE
-    if (!is_backlight_enabled() != asleep) {
+    if (is_backlight_enabled() != !asleep) {
         if (asleep) {
             backlight_disable();
         } else {
diff --git a/quantum/backlight/backlight.c b/quantum/backlight/backlight.c
index 8977e16d76..dbff78d98c 100644
--- a/quantum/backlight/backlight.c
+++ b/quantum/backlight/backlight.c
@@ -107,6 +107,7 @@ void backlight_enable(void) {
 void backlight_enable_old_level(void) {
     if (backlight_config.enable) return; // do nothing if backlight is already on
 
+    backlight_config.enable = true;
     eeconfig_update_backlight(backlight_config.raw);
     dprintf("backlight enable\n");
     backlight_set(backlight_config.level);