diff --git a/src/components/GameItem.astro b/src/components/GameItem.astro
index 91cd955..b711d1f 100644
--- a/src/components/GameItem.astro
+++ b/src/components/GameItem.astro
@@ -2,7 +2,7 @@
 const { name, image, slugName } = Astro.props;
 ---
 
-<div class="game">
+<div class="game" data-name={name}>
   <a href=`/games/${slugName || name}`>
     <img class="game-img" src={image} alt="" />
   </a>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 6d9f6bd..b5ea7b0 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -33,6 +33,7 @@
   "footer.aluProject": "Alu Project",
 
   "games.title": "Games",
+  "games.search": "Search...",
 
   "settings.title": "Settings",
   "settings.proxy": "Proxy",
diff --git a/src/i18n/jp.json b/src/i18n/jp.json
index 3fffeae..aa6f144 100644
--- a/src/i18n/jp.json
+++ b/src/i18n/jp.json
@@ -33,6 +33,7 @@
   "footer.aluProject": "Alu Project",
 
   "games.title": "ゲーム",
+  "games.search": "検索...",
 
   "settings.title": "設定",
   "settings.proxy": "プロキシ",
diff --git a/src/pages/[lang]/games.astro b/src/pages/[lang]/games.astro
index 37deb85..ab796c1 100644
--- a/src/pages/[lang]/games.astro
+++ b/src/pages/[lang]/games.astro
@@ -4,6 +4,7 @@ import games from "../../json/games.json";
 import GameItem from "@components/GameItem.astro";
 
 import { STATIC_PATHS, i18n } from "@i18n/utils";
+import Input from "@components/UI/Input.astro";
 const t = i18n.inferLangUseTranslations(Astro.url);
 
 export function getStaticPaths() {
@@ -13,6 +14,10 @@ export function getStaticPaths() {
 
 <Layout title={t("pages.games")}>
   <h1 class="title-text">{t("games.title")}</h1>
+  <div class="search">
+    <Input inputName="games-search" placeholder={t("games.search")} height="30px" />
+  </div>
+  <div class="no-results"></div>
   <main id="main-content" class="grid">
     {
       Object.keys(games).map((key) => {
@@ -23,31 +28,69 @@ export function getStaticPaths() {
   </main>
 </Layout>
 
+<script>
+  let search = document.getElementById('games-search-input') as HTMLInputElement;
+  let mainContent = document.getElementById('main-content') as HTMLDivElement;
+  search.addEventListener('input', () => {
+    let filter = search.value.toUpperCase();
+    let games = mainContent.children;
+    let results = 0;
+    for (let i = 0; i < games.length; i++) {
+      let game = games[i] as HTMLDivElement;
+      let name = game.getAttribute('data-name')!;
+      if (name.toUpperCase().indexOf(filter) > -1) {
+        game.style.display = '';
+        results++;
+      } else {
+        game.style.display = 'none';
+      }
+    }
+    console.log(results)
+    if (results === 0) {
+      let noResults = document.querySelector('.no-results') as HTMLDivElement;
+      if (noResults) {
+        noResults.style.display = 'block';
+        noResults.innerHTML = 'No results found';
+      }
+    } else {
+      let noResults = document.querySelector('.no-results') as HTMLDivElement;
+      if (noResults) {
+        noResults.style.display = 'none';
+      }
+    }
+  });
+</script>
+
 <style>
+  .title-text {
+    margin-bottom: 5px;
+  }
+  .search {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 20px;
+    width: 50%;
+    margin: 0 auto;
+  }
   .grid {
     color: var(--text-color);
-    margin-top: -10px;
     height: max-content;
-    width: calc(100% - 60px);
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(175px, 1fr));
     text-align: center;
     justify-content: center;
     gap: 1rem;
-    margin-left: 20px;
+    width: 90%;
+    margin: 0 auto;
+    margin-top: 20px;
   }
 
-  @media only screen and (max-width: 973px) {
-    .grid {
-      grid-template-columns: repeat(3, 1fr);
-      padding: 0;
-    }
-  }
-
-  @media only screen and (max-width: 467px) {
-    .grid {
-      grid-template-columns: repeat(2, 1fr);
-    }
+  .no-results {
+    text-align: center;
+    height: 15rem;
+    width: 100%;
+    font-size: 2rem;
+    margin-top: 10px;
+    display: none;
   }
 </style>