diff --git a/packages/components/src/components/ContextMenu/ContextMenu.tsx b/packages/components/src/components/ContextMenu/ContextMenu.tsx
index acc527126..82c9228f8 100644
--- a/packages/components/src/components/ContextMenu/ContextMenu.tsx
+++ b/packages/components/src/components/ContextMenu/ContextMenu.tsx
@@ -76,6 +76,7 @@ export const ContextMenu = flowComponent("ContextMenu", (props) => {
     },
 
     ContextMenuSection: {
+      selectionMode,
       MenuItem: {
         Avatar: {
           size: "l",
@@ -106,7 +107,10 @@ export const ContextMenu = flowComponent("ContextMenu", (props) => {
             onSelectionChange={onSelectionChange}
             ref={ref}
           >
-            <PropsContextProvider props={propsContext}>
+            <PropsContextProvider
+              props={propsContext}
+              dependencies={[selectionMode]}
+            >
               <Action closeOverlay={getCloseOverlayType(selectionMode)}>
                 {children}
               </Action>
diff --git a/packages/components/src/components/ContextMenu/components/ContextMenuSection/ContextMenuSection.tsx b/packages/components/src/components/ContextMenu/components/ContextMenuSection/ContextMenuSection.tsx
index 16115c29e..2f2bfbab2 100644
--- a/packages/components/src/components/ContextMenu/components/ContextMenuSection/ContextMenuSection.tsx
+++ b/packages/components/src/components/ContextMenu/components/ContextMenuSection/ContextMenuSection.tsx
@@ -7,11 +7,7 @@ import type { FlowComponentProps } from "@/lib/componentFactory/flowComponent";
 import { flowComponent } from "@/lib/componentFactory/flowComponent";
 import styles from "../../ContextMenu.module.scss";
 import type { ContextMenuSelectionMode } from "@/components/ContextMenu/lib";
-import {
-  getAriaSelectionMode,
-  getCloseOverlayType,
-  getMenuItemSelectionVariant,
-} from "@/components/ContextMenu/lib";
+import { getCloseOverlayType } from "@/components/ContextMenu/lib";
 import { Action } from "@/components/Action";
 
 export type ContextMenuSectionProps = PropsWithChildren &
@@ -23,24 +19,15 @@ export const ContextMenuSection = flowComponent(
   (props) => {
     const { children, selectionMode, ...rest } = props;
 
-    const selectionVariant = getMenuItemSelectionVariant(selectionMode);
-
     const propsContext: PropsContext = {
       Heading: {
         level: 5,
         wrapWith: <Aria.Header />,
       },
-      MenuItem: {
-        selectionVariant,
-      },
     };
 
     return (
-      <Aria.MenuSection
-        {...rest}
-        selectionMode={getAriaSelectionMode(selectionMode)}
-        className={styles.section}
-      >
+      <Aria.MenuSection {...rest} className={styles.section}>
         <PropsContextProvider props={propsContext} mergeInParentContext>
           <Action skip>
             <Action closeOverlay={getCloseOverlayType(selectionMode)}>
diff --git a/packages/components/src/components/List/components/Table/Table.module.css b/packages/components/src/components/List/components/Table/Table.module.css
index c289fcdfd..9d15235f4 100644
--- a/packages/components/src/components/List/components/Table/Table.module.css
+++ b/packages/components/src/components/List/components/Table/Table.module.css
@@ -3,24 +3,24 @@
     pointer-events: none;
     opacity: 0.5;
   }
-}
 
-.row {
-  &.isSelected {
-    background-color: var(--list-item--background-color--pressed);
-  }
+  .row {
+    &.isSelected {
+      background-color: var(--list-item--background-color--pressed);
+    }
 
-  &:where(.hasAction) {
-    cursor: default;
+    &.hasAction {
+      cursor: default;
 
-    &:not(.isSelected) {
-      &:hover {
-        background-color: var(--list-item--background-color--hover);
-      }
-    }
+      &:not(.isSelected) {
+        &:hover {
+          background-color: var(--list-item--background-color--hover);
+        }
 
-    &[data-pressed] {
-      background-color: var(--list-item--background-color--pressed);
+        &[data-pressed] {
+          background-color: var(--list-item--background-color--pressed);
+        }
+      }
     }
   }
 }
diff --git a/packages/components/src/components/Table/Table.module.scss b/packages/components/src/components/Table/Table.module.scss
index 59ebe4aaf..a465b9287 100644
--- a/packages/components/src/components/Table/Table.module.scss
+++ b/packages/components/src/components/Table/Table.module.scss
@@ -41,7 +41,7 @@
 
   .body {
     .row {
-      &:nth-of-type(odd):not(.footer) {
+      &:where(:nth-of-type(odd):not(.footer)) {
         background-color: var(--table--background-color-accent);
       }