diff --git a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco
index 72444131a..134da4617 100644
--- a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco
@@ -7,7 +7,7 @@
   <h2>Ticket Article</h2>
 
   <div class="ticketZoom">
-    <div class="scrollPageHeader zIndex-9 horizontal center" 
+    <div class="scrollPageHeader tabsSidebar-sidebarSpacer" 
       data-anchor-target=".ticketZoom .page-header"
       data-128-top-bottom="transform: translateY(-64px);"
       data-64-top-bottom="transform: translateY(0px);"
diff --git a/app/assets/javascripts/app/views/layout_ref/highlight.jst.eco b/app/assets/javascripts/app/views/layout_ref/highlight.jst.eco
index 94d5cc4ae..284029188 100644
--- a/app/assets/javascripts/app/views/layout_ref/highlight.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/highlight.jst.eco
@@ -40,7 +40,7 @@
       </li>
     </div>
 
-    <div class="scrollPageHeader zIndex-9 horizontal center" 
+    <div class="scrollPageHeader tabsSidebar-sidebarSpacer" 
       data-anchor-target=".ticketZoom .page-header"
       data-128-top-bottom="transform: translateY(-64px);"
       data-64-top-bottom="transform: translateY(0px);"
diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco
index 116c42e77..c9e4f566c 100644
--- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco
@@ -1,7 +1,7 @@
 <div class="tabsSidebar-holder">
   <div class="main no-padding flex tabsSidebar-sidebarSpacer tabsSidebar-tabsSpacer">
     <div class="ticketZoom">
-      <div class="scrollPageHeader">
+      <div class="scrollPageHeader tabsSidebar-sidebarSpacer">
         <small><%- @C('ticket_hook') %> <span class="ticket-number"><%- @ticket.number %></span></small>
         <div class="ticket-title"></div>
         <div class="highlighter"></div>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 226cdeb19..529dd5f5d 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -3598,10 +3598,6 @@ footer {
   margin-right: 0;
 }
 
-.tabsSidebar-sidebarSpacer.is-closed .scrollPageHeader {
-  margin-right: 0;
-}
-
 .tabsSidebar-holder {
   overflow: hidden;
   position: relative;
@@ -4565,7 +4561,7 @@ footer {
 }
 
 .scrollPageHeader {
-  @extend .zIndex-6;
+  @extend .zIndex-6, .tabsSidebar-sidebarSpacer;
   display: flex;
   align-items: center;
   background: white;
@@ -4573,7 +4569,7 @@ footer {
   height: 64px;
   top: 0;
   left: $navigationWidth;
-  right: $sidebarWidth;
+  right: 0;
   padding: 0 22px;
   position: fixed;
   min-width: $minWidth - $navigationWidth - $sidebarWidth;