diff --git a/packages/client/src/components/CustomThemeWrapper.svelte b/packages/client/src/components/CustomThemeWrapper.svelte
index 9b466bb7d7..c656b09306 100644
--- a/packages/client/src/components/CustomThemeWrapper.svelte
+++ b/packages/client/src/components/CustomThemeWrapper.svelte
@@ -79,4 +79,9 @@
     scrollbar-color: var(--spectrum-global-color-gray-400)
       var(--spectrum-alias-background-color-default);
   }
+
+  /* Remove border when editing contenteditable components */
+  :global(*[contenteditable="true"]:focus) {
+    outline: none;
+  }
 </style>