diff --git a/src/renderer/components/+landing-page/landing-page.scss b/src/renderer/components/+landing-page/landing-page.scss
index ea1eb664ef..8045003b33 100644
--- a/src/renderer/components/+landing-page/landing-page.scss
+++ b/src/renderer/components/+landing-page/landing-page.scss
@@ -10,6 +10,7 @@
     .content {
       margin: unset;
       max-width: unset;
+      height: 100%;
     }
   }
 }
diff --git a/src/renderer/components/layout/page-layout.scss b/src/renderer/components/layout/page-layout.scss
index 6f7045d21c..c4629f0dbe 100644
--- a/src/renderer/components/layout/page-layout.scss
+++ b/src/renderer/components/layout/page-layout.scss
@@ -19,8 +19,8 @@
 
     grid-template-columns: var(--nav-column-width) 1fr;
 
-    > .content {
-      > * {
+    > .content-wrapper {
+      > .content {
         width: 100%;
         padding-left: 1px; // Fix visual content crop
         padding-right: calc(var(--nav-column-width) - var(--nav-width));
@@ -53,13 +53,13 @@
     height: var(--header-height);
     grid-column-start: 1;
     grid-column-end: 4;
-    margin-bottom: 24px;
   }
 
   > .content-navigation {
     display: flex;
     justify-content: flex-end;
     overflow-y: auto;
+    margin-top: 32px;
 
     ul.TreeView {
       width: var(--nav-width);
@@ -67,13 +67,13 @@
     }
   }
 
-  > .content {
+  > .content-wrapper {
+    padding: 32px;
     overflow: auto;
 
-    > * {
+    > .content {
       width: var(--width);
       margin: 0 auto;
-      padding-bottom: 24px;
     }
   }
 
diff --git a/src/renderer/components/layout/page-layout.tsx b/src/renderer/components/layout/page-layout.tsx
index 8ffc2a8f4c..b437a53d56 100644
--- a/src/renderer/components/layout/page-layout.tsx
+++ b/src/renderer/components/layout/page-layout.tsx
@@ -80,11 +80,8 @@ export class PageLayout extends React.Component<PageLayoutProps> {
             <RecursiveTreeView data={navigation}/>
           </nav>
         )}
-        <div
-          className={cssNames("content", contentClass)}
-          id="ScrollSpyRoot"
-        >
-          <div className={cssNames(contentGaps && "flex column gaps")}>
+        <div className="content-wrapper" id="ScrollSpyRoot">
+          <div className={cssNames("content", contentClass, contentGaps && "flex column gaps")}>
             {children}
           </div>
         </div>