diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 20976d15a5..3913071a27 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -79,8 +79,11 @@ $(document).ready(function () {
 
     if (windowWidth < compactWidth) {
       $("body").removeClass("compact-nav").addClass("small-nav");
+      // Toggling the classes is needed until https://github.com/twbs/bootstrap/issues/39213 is added
+      $("nav.primary > .btn-group").removeClass("btn-group").addClass("btn-group-vertical");
     } else if (windowWidth < headerWidth) {
       $("body").addClass("compact-nav").removeClass("small-nav");
+      $("nav.primary > .btn-group").removeClass("btn-group-vertical").addClass("btn-group");
     } else {
       $("body").removeClass("compact-nav").removeClass("small-nav");
     }
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 0edb3b0fc3..f2d10725e1 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -199,9 +199,7 @@ body.small-nav {
     }
   }
 
-  #sidebar .search_forms,
-  #edit_tab,
-  #export_tab {
+  #sidebar .search_forms {
     display: none;
   }
 
@@ -209,10 +207,19 @@ body.small-nav {
     margin-right: 0;
     padding: 0;
 
-    .btn-group {
+    > .btn-group,
+    > .btn-group-vertical {
       width: 100%;
       padding: 10px;
     }
+
+    // Fix Bootstrap 5 bug, see https://github.com/twbs/bootstrap/pull/40488
+    .btn-group-vertical>.btn-group:not(:first-child)>.btn,
+    .btn-group-vertical>.btn:nth-child(n+3),
+    .btn-group-vertical>:not(.btn-check)+.btn {
+      border-top-left-radius: 0;
+      border-top-right-radius: 0;
+    }
   }
 
   nav.secondary {
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 7f2880a1c9..fdc30ba57a 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -8,14 +8,14 @@
   <a href="#" id="menu-icon"></a>
   <nav class='primary'>
     <%= content_for :header %>
-    <div class="btn-group">
-      <div id="edit_tab" class="btn-group">
+    <div class="btn-group" role="group">
+      <div id="edit_tab" class="btn-group" role="group">
         <%= link_to t("layouts.edit"),
                     edit_path,
-                    :class => "btn btn-outline-primary geolink editlink",
+                    :class => "btn btn-outline-primary geolink editlink w-100",
                     :id => "editanchor",
                     :data => { :editor => preferred_editor } %>
-        <button class='btn btn-outline-primary dropdown-toggle dropdown-toggle-split' type='button' data-bs-toggle='dropdown'></button>
+        <button class='btn btn-outline-primary dropdown-toggle dropdown-toggle-split px-3 px-md-2' type='button' data-bs-toggle='dropdown'></button>
         <ul class='dropdown-menu'>
           <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
             <li>