diff --git a/web/components/core/theme/theme-switch.tsx b/web/components/core/theme/theme-switch.tsx
index 78364562f..60ef272a2 100644
--- a/web/components/core/theme/theme-switch.tsx
+++ b/web/components/core/theme/theme-switch.tsx
@@ -46,7 +46,7 @@ export const ThemeSwitch: FC<Props> = (props) => {
       }
       onChange={onChange}
       input
-      width="w-full"
+      width="w-full z-20"
     >
       {THEME_OPTIONS.map((themeOption) => (
         <CustomSelect.Option key={themeOption.value} value={themeOption}>
diff --git a/web/components/issues/issue-layouts/roots/project-layout-root.tsx b/web/components/issues/issue-layouts/roots/project-layout-root.tsx
index db30e4b7c..39f6872cc 100644
--- a/web/components/issues/issue-layouts/roots/project-layout-root.tsx
+++ b/web/components/issues/issue-layouts/roots/project-layout-root.tsx
@@ -48,7 +48,7 @@ export const ProjectLayoutRoot: React.FC = observer(() => {
           {Object.keys(getIssues ?? {}).length == 0 ? (
             <ProjectEmptyState />
           ) : (
-            <div className="relative h-full w-full overflow-auto">
+            <div className="relative h-full w-full overflow-auto bg-custom-background-90">
               {activeLayout === "list" ? (
                 <ListLayout />
               ) : activeLayout === "kanban" ? (