diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index d7b34caa63..5f2197035a 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -71,7 +71,7 @@
       <div id="toc-overlay"></div>
       <nav id="topbar">
         <div>
-          <span class="topbar-right">
+          <div class="topbar-right">
             {{- $showPrevNext := (and (not .Params.disableNextPrev) (not .Site.Params.disableNextPrev)) }}
             {{- if and (or (eq $outputFormat "html") (eq $outputFormat "searchpage")) $showPrevNext }}
               {{- $startarrow := "🡐" }}
@@ -129,8 +129,8 @@
                 "title" (printf "%s (CTRL+ALT+w)" (T "Edit-this-page"))
               )}}
             {{- end }}
-          </span>
-          <span class="topbar-left">
+          </div>
+          <div class="topbar-left">
             {{- partial "topbar-button.html" (dict
               "page" $page
               "class" "topbar-sidebar"
@@ -162,7 +162,7 @@
               {{ .Title }}
             </span>
             {{- end }}
-          </span>
+          </div>
         {{- if $toc }}
 {{ $toc_content }}
         {{- end }}
diff --git a/static/css/theme.css b/static/css/theme.css
index 97b5d08ddb..4cc4056d5e 100644
--- a/static/css/theme.css
+++ b/static/css/theme.css
@@ -1020,9 +1020,13 @@ html[dir="rtl"] .topbar-left .topbar-button {
     background-color: transparent;
 }
 
+#body .topbar-right {
+    display: inline;
+}
 #body .topbar-left {
     border-inline-start-style: solid;
     border-inline-start-width: 1px;
+    display: inline;
     float: left;
     height: auto;
     margin-bottom: 0;