diff --git a/src/renderer/component/app/view.jsx b/src/renderer/component/app/view.jsx
index a6a225df0..23ee922bb 100644
--- a/src/renderer/component/app/view.jsx
+++ b/src/renderer/component/app/view.jsx
@@ -84,8 +84,8 @@ class App extends React.PureComponent<Props> {
         <Theme />
         <main className="page">
           <SideBar />
-          <Header />
           <div className="content" id="content">
+            <Header />
             <Router />
             <ModalRouter />
           </div>
diff --git a/src/renderer/scss/_gui.scss b/src/renderer/scss/_gui.scss
index e7266b68b..48f9b54fc 100644
--- a/src/renderer/scss/_gui.scss
+++ b/src/renderer/scss/_gui.scss
@@ -157,7 +157,7 @@ p {
   grid-template-rows: var(--header-height) calc(100vh - var(--header-height));
   grid-template-columns: var(--side-nav-width) auto;
   grid-template-areas:
-    'nav header'
+    'nav content'
     'nav content';
   background-color: var(--color-bg);
   height: 100vh;
@@ -176,7 +176,7 @@ p {
 */
 .content {
   grid-area: content;
-  overflow: auto;
+  overflow-y: auto;
 }
 
 .main {
diff --git a/src/renderer/scss/component/_header.scss b/src/renderer/scss/component/_header.scss
index 6df42f34e..94eb62974 100644
--- a/src/renderer/scss/component/_header.scss
+++ b/src/renderer/scss/component/_header.scss
@@ -1,11 +1,9 @@
 .header {
-  grid-area: header;
   display: flex;
   z-index: 1;
   justify-content: space-between;
   padding: $spacing-width $spacing-width 0 $spacing-width;
   background-color: var(--color-bg);
-  // height: 100px;
 }
 
 .header__actions-right {