diff --git a/core/themes/claro/css/components/tabs.css b/core/themes/claro/css/components/tabs.css
index 189cf5bbeb..29aaf45c99 100644
--- a/core/themes/claro/css/components/tabs.css
+++ b/core/themes/claro/css/components/tabs.css
@@ -194,6 +194,11 @@
   .tabs-wrapper {
     display: flex;
   }
+
+  .tabs-wrapper--secondary {
+    position: relative;
+  }
+
   .is-horizontal .tabs {
     flex-direction: row;
     width: auto;
@@ -239,6 +244,7 @@
     background: none;
     font-size: 1rem;
   }
+
   .is-horizontal .tabs__tab.is-active {
     order: 0;
     background: none;
diff --git a/core/themes/claro/css/components/tabs.pcss.css b/core/themes/claro/css/components/tabs.pcss.css
index 38248652d1..a993207f6b 100644
--- a/core/themes/claro/css/components/tabs.pcss.css
+++ b/core/themes/claro/css/components/tabs.pcss.css
@@ -176,6 +176,11 @@
   .tabs-wrapper {
     display: flex;
   }
+
+  .tabs-wrapper--secondary {
+    position: relative;
+  }
+
   .is-horizontal .tabs {
     flex-direction: row;
     width: auto;
@@ -221,6 +226,7 @@
     background: none;
     font-size: var(--font-size-base);
   }
+
   .is-horizontal .tabs__tab.is-active {
     order: 0;
     background: none;
diff --git a/core/themes/claro/templates/menu-local-tasks.html.twig b/core/themes/claro/templates/menu-local-tasks.html.twig
index 354a27ca36..aca4611976 100644
--- a/core/themes/claro/templates/menu-local-tasks.html.twig
+++ b/core/themes/claro/templates/menu-local-tasks.html.twig
@@ -21,7 +21,7 @@
 {% endif %}
 {% if secondary %}
   <h2 id="secondary-tabs-title" class="visually-hidden">{{ 'Secondary tabs'|t }}</h2>
-  <nav role="navigation" class="tabs-wrapper is-horizontal is-collapsible" aria-labelledby="secondary-tabs-title" data-drupal-nav-tabs>
-    <ul class="tabs tabs--secondary clearfix" data-drupal-nav-tabs-target>{{ secondary }}</ul>
+  <nav role="navigation" class="tabs-wrapper tabs-wrapper--secondary is-horizontal" aria-labelledby="secondary-tabs-title">
+    <ul class="tabs tabs--secondary clearfix">{{ secondary }}</ul>
   </nav>
 {% endif %}
diff --git a/core/themes/claro/templates/navigation/menu-local-task.html.twig b/core/themes/claro/templates/navigation/menu-local-task.html.twig
index c2b19cd1ff..f74c56ae5e 100644
--- a/core/themes/claro/templates/navigation/menu-local-task.html.twig
+++ b/core/themes/claro/templates/navigation/menu-local-task.html.twig
@@ -15,7 +15,15 @@
  * @see template_preprocess_menu_local_task()
  */
 #}
-<li{{ attributes.addClass('tabs__tab', 'js-tab', is_active ? 'is-active', is_active ? 'js-active-tab') }}>
+{%
+  set classes = [
+    'tabs__tab',
+    level == 'primary' ? 'js-tab',
+    is_active ? 'is-active',
+    is_active ? 'js-active-tab',
+  ]
+%}
+<li{{ attributes.addClass(classes) }}>
   {{ link }}
   {% if is_active and level == 'primary' %}
     <button class="reset-appearance tabs__trigger" aria-label="{{ 'Tabs display toggle'|t }}" data-drupal-nav-tabs-trigger>