diff --git a/ui-ngx/src/app/modules/home/components/debug-config/debug-config-button.component.ts b/ui-ngx/src/app/modules/home/components/debug-config/debug-config-button.component.ts
index 576f926a06..c1a93d8ed9 100644
--- a/ui-ngx/src/app/modules/home/components/debug-config/debug-config-button.component.ts
+++ b/ui-ngx/src/app/modules/home/components/debug-config/debug-config-button.component.ts
@@ -62,7 +62,7 @@ export class DebugConfigButtonComponent {
 
   @Output() onDebugConfigChanged = new EventEmitter<HasDebugConfig>();
 
-  isDebugAllActive$ = timer(0, SECOND).pipe(map(() => this.debugAllUntil > new Date().getTime()), shareReplay(1));
+  isDebugAllActive$ = timer(0, SECOND).pipe(map(() => this.debugAllUntil > new Date().getTime() || this.debugAll), shareReplay(1));
 
   readonly maxDebugModeDurationMinutes = getCurrentAuthState(this.store).maxDebugModeDurationMinutes;
 
diff --git a/ui-ngx/src/app/modules/home/components/debug-config/debug-config-panel.component.ts b/ui-ngx/src/app/modules/home/components/debug-config/debug-config-panel.component.ts
index 80af3bcd87..7ad88955ba 100644
--- a/ui-ngx/src/app/modules/home/components/debug-config/debug-config-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/debug-config/debug-config-panel.component.ts
@@ -63,7 +63,7 @@ export class DebugConfigPanelComponent extends PageComponent implements OnInit {
   isDebugAllActive$ = timer(0, SECOND).pipe(
     map(() => {
       this.cd.markForCheck();
-      return this.debugAllUntil > new Date().getTime();
+      return this.debugAllUntil > new Date().getTime() || this.debugAll;
     }),
     distinctUntilChanged(),
     tap(isDebugOn => this.debugAllControl.patchValue(isDebugOn, { emitEvent: false })),
diff --git a/ui-ngx/src/styles.scss b/ui-ngx/src/styles.scss
index 8760f8e7fd..3d997fc284 100644
--- a/ui-ngx/src/styles.scss
+++ b/ui-ngx/src/styles.scss
@@ -1272,9 +1272,9 @@ pre.tb-highlight {
     border-radius: 20px;
     padding: 0 16px;
 
-    &:not(.active) {
+    &:not(.active, :disabled) {
       color: rgba(0, 0, 0, 0.76);
-      background: rgba(0, 0, 0, 0.06);
+      background-color: rgba(0, 0, 0, 0.06);
     }
 
     &.active:not(:disabled) {