diff --git a/assets/vue/components/basecomponents/BaseRouteTabs.vue b/assets/vue/components/basecomponents/BaseRouteTabs.vue
index 9d313582f86..1325f38cd70 100644
--- a/assets/vue/components/basecomponents/BaseRouteTabs.vue
+++ b/assets/vue/components/basecomponents/BaseRouteTabs.vue
@@ -1,5 +1,8 @@
 <template>
-  <div class="flex">
+  <div
+    class="flex flex-wrap items-center"
+    role="tablist"
+  >
     <BaseAppLink
       v-for="(tab, index) in tabs"
       :key="tab.title"
@@ -10,7 +13,7 @@
           selectedTab !== index,
       }"
       :to="tab.to"
-      class="px-4 py-2 font-semibold"
+      class="px-4 py-2 font-semibold mr-2 sm:mr-3 last:mr-0"
       role="tab"
     >
       {{ tab.title }}