diff --git a/scm-ui/src/groups/containers/Groups.js b/scm-ui/src/groups/containers/Groups.js
index 044cbfdb08..78e373e261 100644
--- a/scm-ui/src/groups/containers/Groups.js
+++ b/scm-ui/src/groups/containers/Groups.js
@@ -78,6 +78,7 @@ class Groups extends React.Component<Props> {
         <GroupTable groups={groups} />
         {this.renderPaginator()}
         {this.renderCreateButton()}
+        {this.renderPageActionCreateButton()}
       </Page>
     );
   }
@@ -93,16 +94,23 @@ class Groups extends React.Component<Props> {
   renderCreateButton() {
     if (this.props.canAddGroups) {
       return (
-        <>
-          <CreateGroupButton />
-          <PageActions>
-            <Button
-              label={this.props.t("create-group-button.label")}
-              link="/groups/add"
-              color="primary"
-            />
-          </PageActions>
-        </>
+        <CreateGroupButton />
+      );
+    } else {
+      return;
+    }
+  }
+
+  renderPageActionCreateButton() {
+    if (this.props.canAddGroups) {
+      return (
+        <PageActions>
+          <Button
+            label={this.props.t("create-group-button.label")}
+            link="/groups/add"
+            color="primary"
+          />
+        </PageActions>
       );
     } else {
       return;
diff --git a/scm-ui/src/repos/containers/Overview.js b/scm-ui/src/repos/containers/Overview.js
index e226032774..1d672aafb1 100644
--- a/scm-ui/src/repos/containers/Overview.js
+++ b/scm-ui/src/repos/containers/Overview.js
@@ -73,6 +73,7 @@ class Overview extends React.Component<Props> {
         error={error}
       >
         {this.renderList()}
+        {this.renderPageActionCreateButton()}
       </Page>
     );
   }
@@ -95,19 +96,23 @@ class Overview extends React.Component<Props> {
     const { showCreateButton, t } = this.props;
     if (showCreateButton) {
       return (
-        <>
-          <CreateButton
+        <CreateButton label={t("overview.createButton")} link="/repos/create" />
+      );
+    }
+    return null;
+  }
+
+  renderPageActionCreateButton() {
+    const { showCreateButton, t } = this.props;
+    if (showCreateButton) {
+      return (
+        <PageActions>
+          <Button
             label={t("overview.createButton")}
             link="/repos/create"
+            color="primary"
           />
-          <PageActions>
-            <Button
-              label={t("overview.createButton")}
-              link="/repos/create"
-              color="primary"
-            />
-          </PageActions>
-        </>
+        </PageActions>
       );
     }
     return null;
diff --git a/scm-ui/src/users/containers/Users.js b/scm-ui/src/users/containers/Users.js
index 39ed89d17e..3d88523479 100644
--- a/scm-ui/src/users/containers/Users.js
+++ b/scm-ui/src/users/containers/Users.js
@@ -78,6 +78,7 @@ class Users extends React.Component<Props> {
         <UserTable users={users} />
         {this.renderPaginator()}
         {this.renderCreateButton()}
+        {this.renderPageActionCreateButton()}
       </Page>
     );
   }
@@ -91,19 +92,25 @@ class Users extends React.Component<Props> {
   }
 
   renderCreateButton() {
+    const { t } = this.props;
+    if (this.props.canAddUsers) {
+      return <CreateButton label={t("users.createButton")} link="/users/add" />;
+    } else {
+      return;
+    }
+  }
+
+  renderPageActionCreateButton() {
     const { t } = this.props;
     if (this.props.canAddUsers) {
       return (
-        <>
-          <CreateButton label={t("users.createButton")} link="/users/add" />
-          <PageActions>
-            <Button
-              label={t("users.createButton")}
-              link="/users/add"
-              color="primary"
-            />
-          </PageActions>
-        </>
+        <PageActions>
+          <Button
+            label={t("users.createButton")}
+            link="/users/add"
+            color="primary"
+          />
+        </PageActions>
       );
     } else {
       return;