diff --git a/webapp/src/components/organisms/Layout/Layout.component.tsx b/webapp/src/components/organisms/Layout/Layout.component.tsx
index 4c463af..6b02165 100644
--- a/webapp/src/components/organisms/Layout/Layout.component.tsx
+++ b/webapp/src/components/organisms/Layout/Layout.component.tsx
@@ -5,13 +5,30 @@ import { useTheme } from '../../global';
 import React from 'react';
 
 export function Layout({ children }: LayoutProps) {
-  const { theme } = useTheme();
+  const { theme, changeTheme } = useTheme();
 
   React.useEffect(() => {
     const themeClassName = `${theme}-mode`;
     document.querySelector('body').className = themeClassName;
   }, [theme])
 
+  const changeThemeByColorScheme = (event: MediaQueryListEvent) => {
+    const theme = event.matches ? "dark" : "light";
+    changeTheme(theme);
+  };
+
+  React.useEffect(() => {
+    window
+      .matchMedia("(prefers-color-scheme: dark)")
+      .addEventListener("change", changeThemeByColorScheme);
+
+    return () => {
+      window
+        .matchMedia("(prefers-color-scheme: dark)")
+        .removeEventListener("keydown", changeThemeByColorScheme);
+    };
+  });
+
   return (
     <>
       <Header />