diff --git a/src/renderer/components/+catalog/catalog.module.scss b/src/renderer/components/+catalog/catalog.module.scss
index 14f68babed..1aea6c7184 100644
--- a/src/renderer/components/+catalog/catalog.module.scss
+++ b/src/renderer/components/+catalog/catalog.module.scss
@@ -12,6 +12,8 @@
   :global(.TableRow):hover .pinIcon {
     opacity: 1;
   }
+
+  flex-grow: 1;
 }
 
 .entityName {
@@ -128,3 +130,10 @@
 .catalogAvatar {
   font-size: 1.2ch;
 }
+
+.views {
+  padding: calc(var(--padding) * 2);
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
\ No newline at end of file
diff --git a/src/renderer/components/+catalog/catalog.tsx b/src/renderer/components/+catalog/catalog.tsx
index 194f35f481..3edca9ea92 100644
--- a/src/renderer/components/+catalog/catalog.tsx
+++ b/src/renderer/components/+catalog/catalog.tsx
@@ -282,7 +282,7 @@ class NonInjectedCatalog extends React.Component<Props & Dependencies> {
 
     return (
       <MainLayout sidebar={this.renderNavigation()}>
-        <div className="p-6 h-full">
+        <div className={styles.views}>
           {this.renderViews()}
         </div>
         {
diff --git a/src/renderer/components/layout/main-layout.module.scss b/src/renderer/components/layout/main-layout.module.scss
index e57f959242..6a8ce8e296 100644
--- a/src/renderer/components/layout/main-layout.module.scss
+++ b/src/renderer/components/layout/main-layout.module.scss
@@ -25,6 +25,7 @@
 .contents {
   grid-area: contents;
   overflow: auto;
+  height: calc(100vh - var(--bottom-bar-height) - var(--main-layout-header));
 }
 
 .footer {