diff --git a/packages/theming/sass/themes/components/grid/_grid-theme.scss b/packages/theming/sass/themes/components/grid/_grid-theme.scss
index 057b98d9..88fef74e 100644
--- a/packages/theming/sass/themes/components/grid/_grid-theme.scss
+++ b/packages/theming/sass/themes/components/grid/_grid-theme.scss
@@ -269,6 +269,10 @@
         $ghost-header-text-color: adaptive-contrast(var(--ghost-header-background));
     }
 
+    @if not($header-selected-text-color) and $header-selected-background and not($header-text-color) {
+        $header-selected-text-color: adaptive-contrast(var(--header-selected-background));
+    }
+
     @if not($header-text-color) and $header-background {
         $header-text-color: adaptive-contrast(var(--header-background));
     }
@@ -277,8 +281,8 @@
         $header-selected-background: dynamic-shade(var(--header-background));
     }
 
-    @if not($header-selected-text-color) and $header-selected-background {
-        $header-selected-text-color: adaptive-contrast(var(--header-selected-background));
+    @if not($header-selected-text-color) and $header-text-color {
+        $header-selected-text-color: var(--header-text-color);
     }
 
     @if not($header-border-color) and $header-background {
@@ -465,10 +469,6 @@
         $filtering-header-text-color: adaptive-contrast(var(--filtering-header-background));
     }
 
-    @if not($filtering-row-background) and $header-background {
-        $filtering-row-background: color-mix(in hsl, var(--header-background), #fff 5%);
-    }
-
     @if not($filtering-row-text-color) and $filtering-row-background {
         $filtering-row-text-color: adaptive-contrast(var(--filtering-row-background));
     }