diff --git a/app/routes/app.search.tsx b/app/routes/app.search.tsx
index 187e69b..72cc5b9 100644
--- a/app/routes/app.search.tsx
+++ b/app/routes/app.search.tsx
@@ -53,7 +53,7 @@ export const action = async ({request}: ActionFunctionArgs) => {
     ...documentResults
   ].sort((a, b) => (a.label ?? '').localeCompare(b.label ?? ''))
 
-  return json({results})
+  return json({results, query})
 }
 
 export const meta: MetaFunction = () => {
@@ -69,7 +69,7 @@ const Search = () => {
       <form method="POST">
         <Label>
           Search
-          <Input name="query" />
+          <Input name="query" defaultValue={data ? data.query : ''} />
         </Label>
       </form>
 
diff --git a/app/routes/app.tsx b/app/routes/app.tsx
index 7cb7963..059f5cb 100644
--- a/app/routes/app.tsx
+++ b/app/routes/app.tsx
@@ -6,9 +6,12 @@ import {
   useLoaderData,
   Link
 } from '@remix-run/react'
+import {useHotkeys} from 'react-hotkeys-hook'
+import {useState, useCallback} from 'react'
 
-import {AButton} from '~/lib/components/button'
+import {AButton, Button} from '~/lib/components/button'
 import {Notificatons} from '~/lib/components/notifications'
+import {Label, inputClasses} from '~/lib/components/input'
 
 import {getPrisma} from '~/lib/prisma.server'
 import {ensureUser} from '~/lib/utils/ensure-user'
@@ -45,12 +48,56 @@ export const loader = async ({request}: LoaderFunctionArgs) => {
 
 export type AppLoader = {user: {name: string; id: string}}
 
+const SearchModal = ({close}: {close: () => void}) => {
+  const focusRef = useCallback((node: HTMLInputElement) => {
+    if (node !== null) {
+      node.focus()
+    }
+  }, [])
+
+  return (
+    <div className="fixed bg-white border-gray-300 border shadow-xl p-4 top-64 w-[60em] left-[calc(50%-30rem)]">
+      <h2 className="text-[#444] text-2xl">Search</h2>
+      <form method="POST" action="/app/search">
+        <Label>
+          <input
+            name="query"
+            ref={focusRef}
+            className={inputClasses}
+            onKeyDown={e => {
+              if (e.key === 'Escape') {
+                close()
+              }
+            }}
+          />
+        </Label>
+        <Button className="bg-green-300">Search</Button>
+        <Button type="button" onClick={close} className="bg-gray-300 ml-2">
+          Cancel
+        </Button>
+      </form>
+    </div>
+  )
+}
+
 const Dashboard = () => {
   const {assets, user, cans} = useLoaderData<typeof loader>()
+  const [searchModalOpen, setSearchModelOpen] = useState(false)
+  useHotkeys('ctrl+k', e => {
+    e.preventDefault()
+    setSearchModelOpen(!searchModalOpen)
+  })
 
   return (
     <div className="grid grid-cols-dashboard min-h-screen gap-8">
       <Notificatons />
+      {searchModalOpen ? (
+        <div className="fixed top-0 bottom-0 left-0 right-0 bg-black/30">
+          <SearchModal close={() => setSearchModelOpen(false)} />
+        </div>
+      ) : (
+        ''
+      )}
       <nav className="bg-gray-300 shadow-xl pt-8 text-[#444]">
         <h1 className="text-center text-4xl mb-8">Net Doc</h1>
         <h2 className="text-xl ml-4 mb-4">Core</h2>
diff --git a/package-lock.json b/package-lock.json
index 3fd6674..bbb0f4a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,6 +29,7 @@
         "qrcode": "^1.5.4",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
+        "react-hotkeys-hook": "^4.5.1",
         "react-use": "^17.5.1",
         "rehype-autolink-headings": "^7.1.0",
         "rehype-slug": "^6.0.0",
@@ -17327,6 +17328,16 @@
         "react": "^18.3.1"
       }
     },
+    "node_modules/react-hotkeys-hook": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/react-hotkeys-hook/-/react-hotkeys-hook-4.5.1.tgz",
+      "integrity": "sha512-scAEJOh3Irm0g95NIn6+tQVf/OICCjsQsC9NBHfQws/Vxw4sfq1tDQut5fhTEvPraXhu/sHxRd9lOtxzyYuNAg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": ">=16.8.1",
+        "react-dom": ">=16.8.1"
+      }
+    },
     "node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
diff --git a/package.json b/package.json
index 5c9d5e6..a697ec3 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "react-hotkeys-hook": "^4.5.1",
     "react-use": "^17.5.1",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",