diff --git a/ts/editor/EditorField.svelte b/ts/editor/EditorField.svelte
index 44f486902..90f748271 100644
--- a/ts/editor/EditorField.svelte
+++ b/ts/editor/EditorField.svelte
@@ -113,7 +113,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     .editor-field {
         overflow: hidden;
-        margin: 0 3px;
+        margin: 1px 3px 0 3px;
 
         border-radius: 5px;
         border: 1px solid var(--border);
@@ -121,7 +121,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         @include elevation(1);
 
         &:focus-within {
-            border-color: var(--border-focus);
+            /* --focus-color set in NoteEditor.svelte */
+            outline: 2px solid var(--focus-color);
+            outline-offset: -1px;
         }
     }
 </style>
diff --git a/ts/editor/NoteEditor.svelte b/ts/editor/NoteEditor.svelte
index 1af2fdb1f..207dc9680 100644
--- a/ts/editor/NoteEditor.svelte
+++ b/ts/editor/NoteEditor.svelte
@@ -436,9 +436,9 @@ the AddCards dialog) should be implemented in the user of this component.
                             $hoveredField = null;
                         }}
                         collapsed={fieldsCollapsed[index]}
-                        --dupes-color={cols[index] === "dupe"
+                        --focus-color={cols[index] === "dupe"
                             ? "var(--accent-danger)"
-                            : "transparent"}
+                            : "var(--border-focus)"}
                     >
                         <svelte:fragment slot="field-label">
                             <LabelContainer