diff --git a/panel/web/package-lock.json b/panel/web/package-lock.json
index 871220a..c6922fe 100644
--- a/panel/web/package-lock.json
+++ b/panel/web/package-lock.json
@@ -11,7 +11,7 @@
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-router-dom": "^6.28.0",
-        "tailwind-merge": "^2.5.4"
+        "tailwind-merge": "^3.6.0"
       },
       "devDependencies": {
         "@types/react": "^18.3.12",
@@ -2487,9 +2487,9 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.1.tgz",
-      "integrity": "sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.6.0.tgz",
+      "integrity": "sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==",
       "license": "MIT",
       "funding": {
         "type": "github",
diff --git a/panel/web/package.json b/panel/web/package.json
index 0f5b5db..90ced39 100644
--- a/panel/web/package.json
+++ b/panel/web/package.json
@@ -12,7 +12,7 @@
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.28.0",
     "clsx": "^2.1.1",
-    "tailwind-merge": "^2.5.4",
+    "tailwind-merge": "^3.6.0",
     "lucide-react": "^0.460.0"
   },
   "devDependencies": {