diff --git a/framework/core/less/common/App.less b/framework/core/less/common/App.less
index b20588ac8..eaef1d2cb 100644
--- a/framework/core/less/common/App.less
+++ b/framework/core/less/common/App.less
@@ -236,16 +236,12 @@
   .App-header {
     padding: 8px;
     height: @header-height;
-    position: absolute;
+    position: fixed;
     top: 0;
     left: 0;
     right: 0;
     z-index: @zindex-header;
 
-    .affix & {
-      position: fixed;
-    }
-
     & when (@config-colored-header = true) {
       .light-contents(@header-color, @header-control-bg, @header-control-color);
     }
diff --git a/framework/core/views/frontend/admin.blade.php b/framework/core/views/frontend/admin.blade.php
index a5ca2b803..2efce2af5 100644
--- a/framework/core/views/frontend/admin.blade.php
+++ b/framework/core/views/frontend/admin.blade.php
@@ -4,7 +4,7 @@
 
     <div id="drawer" class="App-drawer">
 
-        <header id="header" class="App-header">
+        <header id="header" class="App-header navbar-fixed-top">
             <div id="header-navigation" class="Header-navigation"></div>
             <div class="container">
                 <h1 class="Header-title">
diff --git a/framework/core/views/frontend/forum.blade.php b/framework/core/views/frontend/forum.blade.php
index a9ff0b0ca..01c0c7261 100644
--- a/framework/core/views/frontend/forum.blade.php
+++ b/framework/core/views/frontend/forum.blade.php
@@ -6,7 +6,7 @@
 
     <div id="drawer" class="App-drawer">
 
-        <header id="header" class="App-header">
+        <header id="header" class="App-header navbar-fixed-top">
             <div id="header-navigation" class="Header-navigation"></div>
             <div class="container">
                 <h1 class="Header-title">