diff --git a/.changeset/cold-months-wash.md b/.changeset/cold-months-wash.md
new file mode 100644
index 0000000..fd58e9f
--- /dev/null
+++ b/.changeset/cold-months-wash.md
@@ -0,0 +1,5 @@
+---
+"treeground": minor
+---
+
+feat: add remove grammar button
diff --git a/src/components/Editor.tsx b/src/components/Editor.tsx
index 15439a9..6ba1e94 100644
--- a/src/components/Editor.tsx
+++ b/src/components/Editor.tsx
@@ -22,13 +22,14 @@ const Editor: Component<Props> = (props) => {
   createEffect(() => {
     const selectedGrammar = props.selectedGrammar();
     const selectedHighlighter = props.selectedHighlighter();
+    untrack(() => {
+      let editor = props.editor();
+      if (editor) {
+        editor.dispose();
+      }
+      props.setEditor(null);
+    });
     if (selectedGrammar) {
-      untrack(() => {
-        let editor = props.editor();
-        if (editor) {
-          editor.dispose();
-        }
-      });
       createHighlighter({
         themes: ["dark-plus"],
         langs: [selectedHighlighter],
diff --git a/src/components/Nav.tsx b/src/components/Nav.tsx
index 6121401..137d147 100644
--- a/src/components/Nav.tsx
+++ b/src/components/Nav.tsx
@@ -1,5 +1,6 @@
 import { BundledLanguage, bundledLanguages } from "shiki";
 import { AiFillCloseCircle, AiOutlinePlus } from "solid-icons/ai";
+import { IoTrash } from "solid-icons/io";
 import {
   Accessor,
   Component,
@@ -51,6 +52,23 @@ const Nav: Component<{
     }
   };
 
+  const removeGrammar = (e: Event) => {
+    e.preventDefault();
+    const socket = props.ws();
+    const selectedGrmr = props.selectedGrammar();
+    if (socket && selectedGrmr) {
+      sendMsgToServer(socket, {
+        type: "remove",
+        folder: selectedGrmr,
+      });
+      props.setGrammars((prev) =>
+        prev.filter((grammar) => grammar.folder !== selectedGrmr),
+      );
+      props.parseOnNewEditor();
+      props.setSelectedGrammar(props.grammars().at(-1)?.folder);
+    }
+  };
+
   const findSelectedGrammar = () => {
     const selectedGrmr = props.selectedGrammar();
     if (selectedGrmr) {
@@ -89,6 +107,7 @@ const Nav: Component<{
         grmrs[grmrIndex].highlighter = value;
         props.setGrammars((prev) => [...prev]);
         props.setSelectedHighlighter(value);
+        props.parseOnNewEditor();
       }
     }
   };
@@ -103,6 +122,28 @@ const Nav: Component<{
       >
         <AiOutlinePlus />
       </button>
+      <Show when={ctx.modal() === "Add"}>
+        <div class="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
+          <div class="bg-white rounded-lg w-full max-w-md">
+            <div class="flex justify-end p-2 border-b border-gray-300">
+              <AiFillCloseCircle
+                size={28}
+                class="text-gray-500 hover:text-blue-500 active:scale-110 transition-all cursor-pointer"
+                onclick={() => ctx.setModal(null)}
+              />
+            </div>
+            <form class="flex gap-2 p-2 my-2" onSubmit={(e) => addGrammar(e)}>
+              <input
+                class="p-2 border border-gray-300 rounded w-full"
+                placeholder="grammar folder"
+                value={inputGrammar()}
+                onChange={(e) => setInputGrammar(e.target.value)}
+              />
+            </form>
+          </div>
+        </div>
+      </Show>
+      <div class="w-[1px] self-stretch bg-gray-300 rounded-l"></div>
       <Show when={props.grammars().length}>
         <select
           class="border border-gray-300 rounded"
@@ -139,26 +180,17 @@ const Nav: Component<{
           ))}
         </select>
       </Show>
-      <Show when={ctx.modal() === "Add"}>
-        <div class="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
-          <div class="bg-white rounded-lg w-full max-w-md">
-            <div class="flex justify-end p-2 border-b border-gray-300">
-              <AiFillCloseCircle
-                size={28}
-                class="text-gray-500 hover:text-blue-500 active:scale-110 transition-all cursor-pointer"
-                onclick={() => ctx.setModal(null)}
-              />
-            </div>
-            <form class="flex gap-2 p-2 my-2" onSubmit={(e) => addGrammar(e)}>
-              <input
-                class="p-2 border border-gray-300 rounded w-full"
-                placeholder="grammar folder"
-                value={inputGrammar()}
-                onChange={(e) => setInputGrammar(e.target.value)}
-              />
-            </form>
-          </div>
-        </div>
+      <Show when={props.selectedGrammar()}>
+        <button
+          class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-1 px-2 rounded"
+          title="Remove grammar"
+          onClick={removeGrammar}
+        >
+          <IoTrash />
+        </button>
+      </Show>
+      <Show when={props.grammars().length}>
+        <div class="w-[1px] self-stretch bg-gray-300 rounded-l"></div>
       </Show>
       <button
         class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-1 px-2 rounded"
diff --git a/src/components/TreeGround.tsx b/src/components/TreeGround.tsx
index 09e7b3c..49593fe 100644
--- a/src/components/TreeGround.tsx
+++ b/src/components/TreeGround.tsx
@@ -124,11 +124,8 @@ function App() {
   };
 
   createEffect(() => {
-    const selectedGrmr = selectedGrammar();
-    if (selectedGrmr) {
-      localStorage.setItem("treeground.selectedGrammar", selectedGrmr);
-      parseOnNewEditor();
-    }
+    localStorage.setItem("treeground.selectedGrammar", selectedGrammar() || "");
+    parseOnNewEditor();
   });
 
   createEffect(() => {
@@ -140,6 +137,8 @@ function App() {
       const e = editor();
       if (e) {
         parse(e.getValue());
+      } else {
+        setTree(null);
       }
     });
     track(() => editor());
diff --git a/src/global.d.ts b/src/global.d.ts
index 4511b40..6a022bf 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -10,6 +10,10 @@ type ClientMessage =
       type: "add";
       folder: string;
     }
+  | {
+      type: "remove";
+      folder: string;
+    }
   | {
       type: "watch";
       folders: string[];
diff --git a/src/websocket.ts b/src/websocket.ts
index 76673de..9fb8d67 100644
--- a/src/websocket.ts
+++ b/src/websocket.ts
@@ -305,6 +305,11 @@ export default partyHandler({
           watcher.add(folder);
         }
       }
+    } else if (msg.type === "remove") {
+      if (grammars.includes(msg.folder)) {
+        grammars = grammars.filter((grammar) => grammar !== msg.folder);
+        watcher.unwatch(msg.folder);
+      }
     }
   },
 });