diff --git a/scm-ui/ui-components/src/layout/Page.tsx b/scm-ui/ui-components/src/layout/Page.tsx
index 59401c2e0d..9f1e749912 100644
--- a/scm-ui/ui-components/src/layout/Page.tsx
+++ b/scm-ui/ui-components/src/layout/Page.tsx
@@ -94,7 +94,7 @@ export default class Page extends React.Component<Props> {
   }
 
   renderPageHeader() {
-    const { error, afterTitle, subtitle, children } = this.props;
+    const { error, afterTitle, title, subtitle, children } = this.props;
 
     let pageActions = null;
     let pageActionsExists = false;
@@ -114,21 +114,24 @@ export default class Page extends React.Component<Props> {
     });
     const underline = pageActionsExists ? <hr className="header-with-actions" /> : null;
 
-    return (
-      <>
-        <div className="columns">
-          <div className="column">
-            <FlexContainer>
-              <Title title={this.getTextualTitle()}>{this.getTitleComponent()}</Title>
-              {afterTitle && <MarginLeft>{afterTitle}</MarginLeft>}
-            </FlexContainer>
-            <Subtitle subtitle={subtitle} />
+    if (title || subtitle) {
+      return (
+        <>
+          <div className="columns">
+            <div className="column">
+              <FlexContainer>
+                <Title title={this.getTextualTitle()}>{this.getTitleComponent()}</Title>
+                {afterTitle && <MarginLeft>{afterTitle}</MarginLeft>}
+              </FlexContainer>
+              <Subtitle subtitle={subtitle} />
+            </div>
+            {pageActions}
           </div>
-          {pageActions}
-        </div>
-        {underline}
-      </>
-    );
+          {underline}
+        </>
+      );
+    }
+    return null;
   }
 
   renderContent() {