diff --git a/src/components/NoteNavSidebar.svelte b/src/components/NoteNavSidebar.svelte
index 056710b..74c5a8a 100644
--- a/src/components/NoteNavSidebar.svelte
+++ b/src/components/NoteNavSidebar.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { slide } from "svelte/transition";
+  import { untrack } from "svelte";
 
   interface Note {
     id: string;
@@ -9,11 +10,12 @@
 
   interface Props {
     notes: Note[];
-    currentEntry: Note;
+    currentEntry?: Note;
+    currentCategory?: string;
     categories: string[];
   }
 
-  const { notes, currentEntry, categories }: Props = $props();
+  const { notes, currentEntry, currentCategory, categories }: Props = $props();
 
   let search = $state("");
 
@@ -46,8 +48,12 @@
       : title.includes(term) || tags.join(",").includes(term);
   }
 
+  const activeCategory = $derived(
+    currentCategory ?? (currentEntry ? getCategory(currentEntry) : null),
+  );
+
   let openCategories = $state<string[]>(
-    categories.filter((c) => c === getCategory(currentEntry)),
+    untrack(() => categories.filter((c) => c === activeCategory)),
   );
 
   function toggle(cat: string) {
@@ -99,32 +105,42 @@
         (n) => getCategory(n) === cat && matchesSearch(n),
       )}
       {#if catNotes.length > 0 || !search}
+        {@const isFolder = notes.some((n) => n.id.includes("/") && getCategory(n) === cat)}
         <div>
           <!-- Category header -->
-          <button
-            onclick={() => toggle(cat)}
-            class="w-full flex items-center gap-1.5 px-2 py-1 rounded-md hover:bg-base-200/40 transition-colors duration-150 group"
-          >
-            <svg
-              class="w-3 h-3 text-base-content/35 shrink-0 transition-transform duration-200"
-              class:rotate-90={openCategories.includes(cat)}
-              xmlns="http://www.w3.org/2000/svg"
-              viewBox="0 0 24 24"
-              fill="none"
-              stroke="currentColor"
-              stroke-width="2.5"
-              stroke-linecap="round"
-              stroke-linejoin="round"
+          <div class="flex items-center w-full">
+            <button
+              onclick={() => toggle(cat)}
+              class="flex items-center gap-1.5 px-2 py-1 rounded-md hover:bg-base-200/40 transition-colors duration-150 shrink-0"
             >
-              <path d="m9 18 6-6-6-6" />
-            </svg>
-            <span class="text-primary/50 font-mono text-xs shrink-0">/</span>
-            <span
-              class="font-bold tracking-tight text-sm truncate text-base-content/80"
-            >
-              {cat}
-            </span>
-          </button>
+              <svg
+                class="w-3 h-3 text-base-content/35 shrink-0 transition-transform duration-200"
+                class:rotate-90={openCategories.includes(cat)}
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                stroke-width="2.5"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+              >
+                <path d="m9 18 6-6-6-6" />
+              </svg>
+              <span class="text-primary/50 font-mono text-xs shrink-0">/</span>
+            </button>
+            {#if isFolder}
+              <a
+                href={`/notes/${cat}`}
+                class="flex-1 min-w-0 px-1 py-1 rounded-md hover:bg-base-200/40 transition-colors duration-150 font-bold tracking-tight text-sm truncate text-base-content/80 hover:text-base-content"
+              >
+                {cat}
+              </a>
+            {:else}
+              <span class="flex-1 min-w-0 px-1 py-1 font-bold tracking-tight text-sm truncate text-base-content/80">
+                {cat}
+              </span>
+            {/if}
+          </div>
 
           <!-- Notes list -->
           {#if openCategories.includes(cat)}
@@ -138,12 +154,12 @@
                     href={`/notes/${note.id}`}
                     title={note.data.title}
                     class="flex items-center gap-1.5 px-2 py-1 rounded-md text-xs font-mono truncate transition-colors duration-150
-                      {note.id === currentEntry.id
+                      {currentEntry && note.id === currentEntry.id
                       ? 'text-primary/90 bg-primary/10'
                       : 'text-base-content/45 hover:text-base-content/80 hover:bg-base-200/40'}"
                   >
                     <span class="shrink-0 font-mono text-base-content/20">
-                      {note.id === currentEntry.id ? "▸" : "–"}
+                      {currentEntry && note.id === currentEntry.id ? "▸" : "–"}
                     </span>
                     <span class="truncate">{note.data.title}</span>
                   </a>
diff --git a/src/pages/notes/[...slug].astro b/src/pages/notes/[...slug].astro
index d632e66..4c6576b 100644
--- a/src/pages/notes/[...slug].astro
+++ b/src/pages/notes/[...slug].astro
@@ -6,11 +6,7 @@ import NoteTOC from "../../components/NoteTOC.astro";
 import NoteNavSidebar from "../../components/NoteNavSidebar.svelte";
 import NoteGraphSidebar from "../../components/NoteGraphSidebar.astro";
 import NoteVars from "../../components/NoteVars.svelte";
-import {
-  getCategory,
-  extractLinks,
-  extractHeadings,
-} from "../../utils/notes";
+import { getCategory, extractLinks, extractHeadings } from "../../utils/notes";
 
 export async function getStaticPaths() {
   const notes = await getCollection("notes");
@@ -41,7 +37,11 @@ const backlinks = allNotes.filter(
 
 const graphNodes = [
   { id: entry.id, title: entry.data.title, current: true },
-  ...forwardLinks.map((n) => ({ id: n.id, title: n.data.title, current: false })),
+  ...forwardLinks.map((n) => ({
+    id: n.id,
+    title: n.data.title,
+    current: false,
+  })),
   ...backlinks
     .filter((n) => !forwardLinks.some((f) => f.id === n.id))
     .map((n) => ({ id: n.id, title: n.data.title, current: false })),
@@ -72,7 +72,7 @@ const headings = extractHeadings(entry.body ?? "");
 </style>
 
 <Layout
-  title={`${entry.data.title} — Security Notes`}
+  title={`${entry.data.title} - Security Notes`}
   description={entry.data.description}
 >
   <main class="max-w-screen-2xl mx-auto">
@@ -92,12 +92,24 @@ const headings = extractHeadings(entry.body ?? "");
                   >
                     <ul>
                       <li>
-                        <a
-                          href="/notes"
-                          class="hover:text-base-content/70"
-                        >notes</a>
+                        <a href="/notes" class="hover:text-base-content/70"
+                          >notes</a
+                        >
+                      </li>
+                      <li>
+                        {
+                          entry.id.includes("/") ? (
+                            <a
+                              href={`/notes/${getCategory(entry)}`}
+                              class="hover:text-base-content/70"
+                            >
+                              {getCategory(entry)}
+                            </a>
+                          ) : (
+                            getCategory(entry)
+                          )
+                        }
                       </li>
-                      <li>{getCategory(entry)}</li>
                     </ul>
                   </div>
                   <div class="flex items-center gap-2">
@@ -196,8 +208,7 @@ const headings = extractHeadings(entry.body ?? "");
             <label
               for="nav-drawer"
               aria-label="close sidebar"
-              class="drawer-overlay"
-            ></label>
+              class="drawer-overlay"></label>
             <NoteNavSidebar
               client:load
               notes={sortedNotes}
@@ -212,8 +223,7 @@ const headings = extractHeadings(entry.body ?? "");
         <label
           for="graph-drawer"
           aria-label="close sidebar"
-          class="drawer-overlay xl:hidden"
-        ></label>
+          class="drawer-overlay xl:hidden"></label>
         <NoteGraphSidebar
           entry={entry}
           graphNodes={graphNodes}
diff --git a/src/pages/notes/[category].astro b/src/pages/notes/[category].astro
new file mode 100644
index 0000000..93879ab
--- /dev/null
+++ b/src/pages/notes/[category].astro
@@ -0,0 +1,178 @@
+---
+import { getCollection } from "astro:content";
+import Layout from "../../layouts/Layout.astro";
+import NoteNavSidebar from "../../components/NoteNavSidebar.svelte";
+import { getCategory } from "../../utils/notes";
+import { List } from "@lucide/astro";
+
+export async function getStaticPaths() {
+  const notes = await getCollection("notes");
+
+  const folderCategories = [
+    ...new Set(
+      notes.filter((n) => n.id.includes("/")).map((n) => getCategory(n)),
+    ),
+  ];
+
+  return folderCategories.map((category) => {
+    const allNotes = notes.sort((a, b) =>
+      a.data.title.localeCompare(b.data.title),
+    );
+    const categories = [...new Set(notes.map(getCategory))].sort();
+    return {
+      params: { category },
+      props: {
+        category,
+        categoryNotes: notes
+          .filter((n) => getCategory(n) === category)
+          .sort((a, b) => a.data.title.localeCompare(b.data.title)),
+        allNotes,
+        categories,
+      },
+    };
+  });
+}
+
+const { category, categoryNotes, allNotes, categories } = Astro.props;
+
+if (!categoryNotes) {
+  return new Response(null, { status: 404, statusText: "Not found" });
+}
+---
+
+<style>
+  .drawer.lg\:drawer-open > .drawer-side {
+    top: 3rem;
+    height: calc(100vh - 3rem);
+  }
+</style>
+
+<Layout
+  title={`${category} - Security Notes`}
+  description={`Notes on ${category}.`}
+>
+  <main class="max-w-screen-2xl mx-auto">
+    <div class="drawer lg:drawer-open min-h-[calc(100vh-3rem)]">
+      <input id="nav-drawer" type="checkbox" class="drawer-toggle" />
+
+      <div class="drawer-content flex flex-col min-w-0">
+        <main class="flex-1 px-4 sm:px-6 lg:px-10 py-6 lg:py-10 min-w-0">
+          <div class="max-w-3xl mx-auto lg:mx-0">
+            <div class="flex items-center justify-between mb-10">
+              <div
+                class="breadcrumbs text-xs font-mono text-base-content/35 p-0"
+              >
+                <ul>
+                  <li>
+                    <a href="/notes" class="hover:text-base-content/70"
+                      >notes</a>
+                  </li>
+                  <li class="text-base-content/60">{category}</li>
+                </ul>
+              </div>
+              <label
+                for="nav-drawer"
+                class="btn btn-ghost btn-xs lg:hidden font-mono text-base-content/40 hover:text-base-content/70 border border-base-300/50"
+              >
+                <List size={11} />
+                nav
+              </label>
+            </div>
+
+            <div class="mb-10">
+              <div class="flex items-baseline gap-3 mb-1">
+                <h1 class="text-4xl sm:text-5xl font-bold">
+                  <span class="text-primary/40 font-mono mr-1">/</span>{
+                    category
+                  }
+                </h1>
+              </div>
+              <p class="font-mono text-xs text-base-content/25 ml-8">
+                {categoryNotes.length} note{
+                  categoryNotes.length !== 1 ? "s" : ""
+                }
+              </p>
+            </div>
+
+            <div class="border-t border-base-300/40 mb-1"></div>
+            <ul class="divide-y divide-base-300/20">
+              {
+                categoryNotes.map((note) => (
+                  <li>
+                    <a
+                      href={`/notes/${note.id}`}
+                      class="group flex items-center gap-4 py-3 hover:bg-base-200/30 px-2 -mx-2 transition-colors"
+                    >
+                      <div class="flex-1 min-w-0">
+                        <div class="flex flex-col mb-0.5">
+                          <span class="font-semibold text-sm group-hover:text-primary transition-colors">
+                            {note.data.title}
+                          </span>
+                          {note.data.description && (
+                            <span class="text-xs text-base-content/35 truncate">
+                              {note.data.description}
+                            </span>
+                          )}
+                        </div>
+                        {note.data.tags.length > 0 && (
+                          <div class="flex flex-wrap gap-1 mt-1">
+                            {note.data.tags.map((tag) => (
+                              <span class="badge badge-ghost badge-xs font-mono text-base-content/30">
+                                {tag}
+                              </span>
+                            ))}
+                          </div>
+                        )}
+                      </div>
+                      <svg
+                        xmlns="http://www.w3.org/2000/svg"
+                        width="14"
+                        height="14"
+                        viewBox="0 0 24 24"
+                        fill="none"
+                        stroke="currentColor"
+                        stroke-width="2"
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                        class="text-base-content/20 group-hover:text-primary/50 shrink-0 transition-colors"
+                      >
+                        <path d="m9 18 6-6-6-6" />
+                      </svg>
+                    </a>
+                  </li>
+                ))
+              }
+            </ul>
+
+            <div
+              class="border-t border-base-300/30 mt-12 pt-6 flex items-center justify-between font-mono text-[10px] text-base-content/25"
+            >
+              <a
+                href="/notes"
+                class="hover:text-base-content/50 transition-colors"
+              >
+                ← all notes
+              </a>
+              <a href="/" class="hover:text-base-content/50 transition-colors">
+                ~/hadi
+              </a>
+            </div>
+          </div>
+        </main>
+      </div>
+
+      <div class="drawer-side z-50">
+        <label
+          for="nav-drawer"
+          aria-label="close sidebar"
+          class="drawer-overlay"></label>
+        <NoteNavSidebar
+          client:load
+          notes={allNotes}
+          currentCategory={category}
+          categories={categories}
+        />
+      </div>
+    </div>
+  </main>
+</Layout>
diff --git a/src/pages/notes/index.astro b/src/pages/notes/index.astro
index 69385d9..43983d7 100644
--- a/src/pages/notes/index.astro
+++ b/src/pages/notes/index.astro
@@ -22,7 +22,7 @@ const searchNotes = sortedNotes.map((n) => ({
 ---
 
 <Layout
-  title="Security Notes — Another Hadi"
+  title="Security Notes - Another Hadi"
   description="Reference notes on cybersecurity tools and techniques."
 >
   <main class="max-w-4xl mx-auto px-4 py-16 sm:py-20">