diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 4618a9d3..1339cfdd 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -8004,7 +8004,6 @@ dependencies = [
  "tauri-plugin",
  "tauri-plugin-dialog",
  "thiserror 2.0.17",
- "tokio",
  "ts-rs",
  "yaak-common",
 ]
diff --git a/src-tauri/yaak-models/Cargo.toml b/src-tauri/yaak-models/Cargo.toml
index fd88ad6b..371e1172 100644
--- a/src-tauri/yaak-models/Cargo.toml
+++ b/src-tauri/yaak-models/Cargo.toml
@@ -22,7 +22,6 @@ sha2 = { workspace = true }
 tauri = { workspace = true }
 tauri-plugin-dialog = { workspace = true }
 thiserror = { workspace = true }
-tokio = { workspace = true }
 ts-rs = { workspace = true, features = ["chrono-impl", "serde-json-impl"] }
 yaak-common = { workspace = true }
 
diff --git a/src-web/components/core/Editor/Editor.css b/src-web/components/core/Editor/Editor.css
index 968259a2..a663d8f9 100644
--- a/src-web/components/core/Editor/Editor.css
+++ b/src-web/components/core/Editor/Editor.css
@@ -19,6 +19,11 @@
       @apply text-surface !important;
     }
 
+    /* Matching bracket */
+    .cm-matchingBracket {
+      @apply bg-transparent border-b border-b-text-subtle;
+    }
+
     &:not(.cm-focused) {
       .cm-cursor, .cm-fat-cursor {
         @apply hidden;
diff --git a/src-web/components/core/Editor/extensions.ts b/src-web/components/core/Editor/extensions.ts
index ded2f41e..a85d2416 100644
--- a/src-web/components/core/Editor/extensions.ts
+++ b/src-web/components/core/Editor/extensions.ts
@@ -10,7 +10,7 @@ import { json } from '@codemirror/lang-json';
 import { markdown } from '@codemirror/lang-markdown';
 import { xml } from '@codemirror/lang-xml';
 import type { LanguageSupport } from '@codemirror/language';
-import {
+import  { bracketMatching ,
   codeFolding,
   foldGutter,
   foldKeymap,
@@ -258,6 +258,7 @@ export const multiLineExtensions = ({ hideGutter }: { hideGutter?: boolean }) =>
   indentOnInput(),
   rectangularSelection(),
   crosshairCursor(),
+  bracketMatching(),
   highlightActiveLineGutter(),
   keymap.of([...searchKeymap, ...foldKeymap, ...lintKeymap]),
 ];