diff --git a/packages/frontend-2/components/viewer/controls/Bottom.vue b/packages/frontend-2/components/viewer/controls/Bottom.vue
index e9dbc3ec5..7eb556a80 100644
--- a/packages/frontend-2/components/viewer/controls/Bottom.vue
+++ b/packages/frontend-2/components/viewer/controls/Bottom.vue
@@ -28,10 +28,18 @@
         </p>
       </span>
       <div class="flex items-center gap-1">
-        <FormButton v-if="showResetButton" size="sm" color="subtle" @click="onReset">
+        <FormButton
+          v-if="showResetButton"
+          tabindex="-1"
+          size="sm"
+          color="subtle"
+          @click="onReset"
+        >
           Reset
         </FormButton>
-        <FormButton size="sm" @click="onActivePanelClose">Done</FormButton>
+        <FormButton tabindex="-1" size="sm" @click="onActivePanelClose">
+          Done
+        </FormButton>
       </div>
 
       <div class="absolute left-1/2 -translate-x-1/2 bottom-9 w-80">
diff --git a/packages/frontend-2/components/viewer/filters/Panel.vue b/packages/frontend-2/components/viewer/filters/Panel.vue
index 3f38cfb3a..4d1e82b14 100644
--- a/packages/frontend-2/components/viewer/filters/Panel.vue
+++ b/packages/frontend-2/components/viewer/filters/Panel.vue
@@ -7,6 +7,7 @@
           v-if="title !== 'Object Type'"
           size="sm"
           color="subtle"
+          tabindex="-1"
           @click="
             ;(showAllFilters = false),
               removePropertyFilter(),
diff --git a/packages/frontend-2/components/viewer/measurements/Menu.vue b/packages/frontend-2/components/viewer/measurements/Menu.vue
index e8a18b748..1000477e1 100644
--- a/packages/frontend-2/components/viewer/measurements/Menu.vue
+++ b/packages/frontend-2/components/viewer/measurements/Menu.vue
@@ -57,7 +57,12 @@
         </ViewerButtonGroup>
 
         <div class="flex gap-1.5">
-          <FormButton size="sm" color="outline" @click="clearMeasurements">
+          <FormButton
+            size="sm"
+            color="outline"
+            tabindex="-1"
+            @click="clearMeasurements"
+          >
             Delete all
           </FormButton>
           <button