diff --git a/.github/workflows/typescript-check.yml b/.github/workflows/typescript-check.yml
index 8a660ee..d7814a4 100644
--- a/.github/workflows/typescript-check.yml
+++ b/.github/workflows/typescript-check.yml
@@ -27,3 +27,7 @@ jobs:
 
       - name: Checking types
         run: yarn --cwd ./app ./node_modules/.bin/tsc --noEmit
+
+      - name: Checking types (attempt 2)
+        run: yarn --cwd ./app tsc --noEmit
+
diff --git a/app/src/components/base/Navbar/Navbar.tsx b/app/src/components/base/Navbar/Navbar.tsx
index 2be6335..68821b7 100644
--- a/app/src/components/base/Navbar/Navbar.tsx
+++ b/app/src/components/base/Navbar/Navbar.tsx
@@ -1,18 +1,13 @@
-import { useRouter } from "next/router"
 import { NavbarRoot } from "./NavbarRoot"
 import { LogoNav } from "./LogoNav"
-import SearchBox from "../SearchBox"
 import Options from "../Options"
+import SearchBox from "./SearchBox"
 
 export default function Navbar() {
-  const router = useRouter()
-
   return (
     <NavbarRoot>
       <LogoNav />
-      {router.pathname === "/" || router.pathname === "/about" ? null : (
-        <SearchBox />
-      )}
+      <SearchBox />
       <Options />
     </NavbarRoot>
   )
diff --git a/app/src/components/base/Searchbox/SearchBox.tsx b/app/src/components/base/Navbar/SearchBox.tsx
similarity index 100%
rename from app/src/components/base/Searchbox/SearchBox.tsx
rename to app/src/components/base/Navbar/SearchBox.tsx
diff --git a/app/src/components/base/Searchbox/SearchDropdown.tsx b/app/src/components/base/Navbar/SearchDropdown.tsx
similarity index 100%
rename from app/src/components/base/Searchbox/SearchDropdown.tsx
rename to app/src/components/base/Navbar/SearchDropdown.tsx
diff --git a/app/src/components/base/Navbar/index.tsx b/app/src/components/base/Navbar/index.tsx
index 6c3324f..19f182b 100644
--- a/app/src/components/base/Navbar/index.tsx
+++ b/app/src/components/base/Navbar/index.tsx
@@ -1,3 +1 @@
 export { default } from "./Navbar"
-export { NavbarRoot } from "./NavbarRoot"
-export { LogoNav } from "./LogoNav"
diff --git a/app/src/components/base/Searchbox/index.tsx b/app/src/components/base/Searchbox/index.tsx
deleted file mode 100644
index a9864ab..0000000
--- a/app/src/components/base/Searchbox/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "./SearchBox"