diff --git a/lib/core/styles/_index.scss b/lib/core/styles/_index.scss
index 0469c1e456..ec01d8a97b 100644
--- a/lib/core/styles/_index.scss
+++ b/lib/core/styles/_index.scss
@@ -70,4 +70,5 @@
     @include adf-sidenav-layout-theme($theme);
     @include adf-clipboard-theme($theme);
     @include adf-snackbar-theme($theme);
+    @include mat-expansion-panel-theme--fix($theme);
 }
diff --git a/lib/core/styles/_mixins.scss b/lib/core/styles/_mixins.scss
index bc72774112..03e77e1d92 100644
--- a/lib/core/styles/_mixins.scss
+++ b/lib/core/styles/_mixins.scss
@@ -65,3 +65,17 @@
     height: 100%;
     overflow: hidden;
 }
+
+@mixin mat-expansion-panel-theme--fix($theme) {
+    $background: map-get($theme, background);
+
+    .mat-expansion-panel {
+        & .mat-expansion-panel-header.cdk-keyboard-focused,
+        & .mat-expansion-panel-header.cdk-program-focused,
+        &:not(.mat-expanded) .mat-expansion-panel-header:hover {
+            &:not([aria-disabled='true']) {
+                background: mat-color($background, hover);
+            }
+        }
+    }
+}