diff --git a/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.sass b/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.sass
index ef1f362d7cb3..c16e294dd393 100644
--- a/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.sass
+++ b/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.sass
@@ -4,8 +4,8 @@ $ian-bg-color: var(--body-background)
 $ian-bg-hover-color: var(--bgColor-neutral-muted)
 $ian-bg-read-color: var(--bgColor-muted)
 $ian-bg-read-hover-color: hsl(from var(--bgColor-neutral-muted) h s calc(l - 0.5))
-$ian-bg-selected-color: var(--selection-bgColor)
-$ian-bg-selected-hover-color: hsl(from var(--selection-bgColor) h calc(s - 30) l)
+$ian-bg-selected-color: var(--codeMirror-selection-bgColor)
+$ian-bg-selected-hover-color: hsl(from var(--codeMirror-selection-bgColor) h calc(s - 30) l)
 // This needs to be set in the itemSize of
 // the virtual scroller
 $ian-height: 100px
diff --git a/frontend/src/global_styles/content/_tables.sass b/frontend/src/global_styles/content/_tables.sass
index 94317c659217..fc1f477de2b4 100644
--- a/frontend/src/global_styles/content/_tables.sass
+++ b/frontend/src/global_styles/content/_tables.sass
@@ -155,13 +155,13 @@ th.hidden
 
 tr.context-menu-selection,
 tr.-checked
-  background-color: var(--selection-bgColor) !important
+  background-color: var(--codeMirror-selection-bgColor) !important
   &[class*=__hl_background]
     outline: var(--table-row-highlighting-outline-color) solid 2px
 
   td
-    border-top: 1px solid var(--selection-bgColor) !important
-    border-bottom: 1px solid var(--selection-bgColor) !important
+    border-top: 1px solid var(--codeMirror-selection-bgColor) !important
+    border-bottom: 1px solid var(--codeMirror-selection-bgColor) !important
     color: var(--body-font-color) !important
     a
       color: var(--body-font-color) !important
diff --git a/frontend/src/global_styles/layout/work_packages/_table.sass b/frontend/src/global_styles/layout/work_packages/_table.sass
index a9c36f7e2f96..1312c079b19d 100644
--- a/frontend/src/global_styles/layout/work_packages/_table.sass
+++ b/frontend/src/global_styles/layout/work_packages/_table.sass
@@ -74,7 +74,7 @@ body[class*="router--"]
     background: var(--bgColor-neutral-muted) !important
 
     &.-checked
-      background-color: hsl(from var(--selection-bgColor) h calc(s - 30) l) !important
+      background-color: hsl(from var(--codeMirror-selection-bgColor) h calc(s - 30) l) !important
 
 // Left part of the split view
 // == flex container for (table|timeline)
diff --git a/frontend/src/global_styles/layout/work_packages/_table_embedded.sass b/frontend/src/global_styles/layout/work_packages/_table_embedded.sass
index c46dec06d669..d92fe90b851a 100644
--- a/frontend/src/global_styles/layout/work_packages/_table_embedded.sass
+++ b/frontend/src/global_styles/layout/work_packages/_table_embedded.sass
@@ -77,7 +77,7 @@ $table-timeline--compact-row-height: 28px
     .wp-table--row
       border-bottom: none !important
       &:hover
-        background-color: var(--selection-bgColor)
+        background-color: var(--codeMirror-selection-bgColor)
 
     thead,
     .generic-table--sort-header-outer