diff --git a/code/core/src/components/components/tooltip/Tooltip.tsx b/code/core/src/components/components/tooltip/Tooltip.tsx
index 630a7b96945b..3a81d40aaabe 100644
--- a/code/core/src/components/components/tooltip/Tooltip.tsx
+++ b/code/core/src/components/components/tooltip/Tooltip.tsx
@@ -96,6 +96,7 @@ const Wrapper = styled.div<WrapperProps>(
   ({ hidden }) => ({
     display: hidden ? 'none' : 'inline-block',
     zIndex: 2147483647,
+    colorScheme: 'light dark',
   }),
   ({ theme, color, hasChrome }) =>
     hasChrome
diff --git a/code/core/src/manager/components/layout/Layout.tsx b/code/core/src/manager/components/layout/Layout.tsx
index 976bcfd68aa2..918f3c6d1a7f 100644
--- a/code/core/src/manager/components/layout/Layout.tsx
+++ b/code/core/src/manager/components/layout/Layout.tsx
@@ -210,6 +210,7 @@ const LayoutContainer = styled.div<LayoutState & { showPanel: boolean }>(
       overflow: 'hidden',
       display: 'flex',
       flexDirection: 'column',
+      colorScheme: 'light dark',
 
       [MEDIA_DESKTOP_BREAKPOINT]: {
         display: 'grid',