diff --git a/ts/editor-toolbar/ColorPicker.svelte b/ts/editor-toolbar/ColorPicker.svelte
index 085f1b351..699900a6e 100644
--- a/ts/editor-toolbar/ColorPicker.svelte
+++ b/ts/editor-toolbar/ColorPicker.svelte
@@ -32,6 +32,6 @@
     }
 </style>
 
-<button>
+<button tabindex="-1">
     <span class={className}> <input type="color" on:change={onChange} /> </span>
 </button>
diff --git a/ts/editor-toolbar/InnerButton.svelte b/ts/editor-toolbar/InnerButton.svelte
index a8bc76688..ca9181fec 100644
--- a/ts/editor-toolbar/InnerButton.svelte
+++ b/ts/editor-toolbar/InnerButton.svelte
@@ -48,6 +48,7 @@
 <button
     class="p-1 {className}"
     class:active
+    tabindex="-1"
     {disabled}
     on:click={onClick}
     on:mousedown|preventDefault>
diff --git a/ts/editor-toolbar/LabelButton.svelte b/ts/editor-toolbar/LabelButton.svelte
index be50d4c56..8b429e753 100644
--- a/ts/editor-toolbar/LabelButton.svelte
+++ b/ts/editor-toolbar/LabelButton.svelte
@@ -18,4 +18,4 @@
     }
 </style>
 
-<button type="button" class="btn btn-secondary" on:click> {label} </button>
+<button class="btn btn-secondary" tabindex="-1" on:click> {label} </button>