diff --git a/components/edit-video-modal.html b/components/edit-video-modal.html
index 9822400e..5fac2a24 100644
--- a/components/edit-video-modal.html
+++ b/components/edit-video-modal.html
@@ -207,7 +207,9 @@
             class="space-y-6 rounded-lg border border-gray-800 bg-black/30 p-4"
             data-nip71-section="tags"
           >
-            <legend class="text-sm font-semibold text-gray-200">NIP-71 tags</legend>
+            <legend class="relative text-sm font-semibold text-gray-200">
+              <span class="inline-block -ml-2 rounded px-2 bg-black/30">NIP-71 tags</span>
+            </legend>
             <p class="text-xs text-gray-400">
               Use the controls below to describe media variants, captions, chapters, participants, and references.
             </p>
diff --git a/components/upload-modal.html b/components/upload-modal.html
index 9c0038ad..6fc82488 100644
--- a/components/upload-modal.html
+++ b/components/upload-modal.html
@@ -273,7 +273,9 @@
               class="space-y-6 rounded-lg border border-gray-800 bg-black/30 p-4"
               data-nip71-section="tags"
             >
-              <legend class="text-sm font-semibold text-gray-200">NIP-71 tags</legend>
+              <legend class="relative text-sm font-semibold text-gray-200">
+                <span class="inline-block -ml-2 rounded px-2 bg-black/30">NIP-71 tags</span>
+              </legend>
               <p class="text-xs text-gray-400">
                 Use the controls below to describe media variants, captions, chapters, participants, and references.
               </p>
diff --git a/css/style.css b/css/style.css
index 9cf34828..ddcb429b 100644
--- a/css/style.css
+++ b/css/style.css
@@ -82,6 +82,12 @@ body {
   overflow-x: hidden; /* Disable horizontal scrolling */
 }
 
+#nip71TagsFieldset > legend,
+#editNip71TagsFieldset > legend {
+  margin-left: 0;
+  padding: 0;
+}
+
 #app {
   /*
     Keep the primary content surface aligned with the page background so the