diff --git a/themes/Fukasawa/LayoutSearch.js b/themes/Fukasawa/LayoutSearch.js
index 8112f850..727e9595 100644
--- a/themes/Fukasawa/LayoutSearch.js
+++ b/themes/Fukasawa/LayoutSearch.js
@@ -1,8 +1,23 @@
 import LayoutBase from './LayoutBase'
 import BlogListPage from './components/BlogListPage'
+import { useRouter } from 'next/router'
+import { useEffect } from 'react'
 
 export const LayoutSearch = (props) => {
-  return <LayoutBase {...props}>
+  const { keyword } = props
+  const router = useRouter()
+  const currentSearch = keyword || router?.query?.s
+  useEffect(() => {
+    setTimeout(() => {
+      const container = document.getElementById('container')
+      if (container && container.innerHTML) {
+        const re = new RegExp(`${currentSearch}`, 'gim')
+        container.innerHTML = container.innerHTML.replace(re, `<span class='text-red-500 border-b border-dashed'>${currentSearch}</span>`)
+      }
+    },
+    100)
+  })
+  return <LayoutBase {...props} currentSearch={currentSearch}>
         <BlogListPage {...props}/>
   </LayoutBase>
 }
diff --git a/themes/Fukasawa/components/AsideLeft.js b/themes/Fukasawa/components/AsideLeft.js
index a596ae27..3f1047d7 100644
--- a/themes/Fukasawa/components/AsideLeft.js
+++ b/themes/Fukasawa/components/AsideLeft.js
@@ -19,7 +19,7 @@ function AsideLeft (props) {
 
     <section className='flex flex-col text-gray-600'>
       <hr className='w-12 my-8' />
-      <SearchInput/>
+      <SearchInput {...props}/>
     </section>
 
     <section className='flex flex-col'>