diff --git a/scm-ui/src/groups/containers/Groups.js b/scm-ui/src/groups/containers/Groups.js
index 7bc31a8b79..044cbfdb08 100644
--- a/scm-ui/src/groups/containers/Groups.js
+++ b/scm-ui/src/groups/containers/Groups.js
@@ -78,13 +78,6 @@ class Groups extends React.Component<Props> {
         <GroupTable groups={groups} />
         {this.renderPaginator()}
         {this.renderCreateButton()}
-        <PageActions>
-          <Button
-            label={t("create-group-button.label")}
-            link="/groups/add"
-            color="primary"
-          />
-        </PageActions>
       </Page>
     );
   }
@@ -99,7 +92,18 @@ class Groups extends React.Component<Props> {
 
   renderCreateButton() {
     if (this.props.canAddGroups) {
-      return <CreateGroupButton />;
+      return (
+        <>
+          <CreateGroupButton />
+          <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 ac044b5225..e226032774 100644
--- a/scm-ui/src/repos/containers/Overview.js
+++ b/scm-ui/src/repos/containers/Overview.js
@@ -73,13 +73,6 @@ class Overview extends React.Component<Props> {
         error={error}
       >
         {this.renderList()}
-        <PageActions>
-          <Button
-            label={t("overview.createButton")}
-            link="/repos/create"
-            color="primary"
-          />
-        </PageActions>
       </Page>
     );
   }
@@ -102,7 +95,19 @@ class Overview extends React.Component<Props> {
     const { showCreateButton, t } = this.props;
     if (showCreateButton) {
       return (
-        <CreateButton label={t("overview.createButton")} link="/repos/create" />
+        <>
+          <CreateButton
+            label={t("overview.createButton")}
+            link="/repos/create"
+          />
+          <PageActions>
+            <Button
+              label={t("overview.createButton")}
+              link="/repos/create"
+              color="primary"
+            />
+          </PageActions>
+        </>
       );
     }
     return null;
diff --git a/scm-ui/src/users/containers/Users.js b/scm-ui/src/users/containers/Users.js
index 10dedde32d..39ed89d17e 100644
--- a/scm-ui/src/users/containers/Users.js
+++ b/scm-ui/src/users/containers/Users.js
@@ -78,13 +78,6 @@ class Users extends React.Component<Props> {
         <UserTable users={users} />
         {this.renderPaginator()}
         {this.renderCreateButton()}
-        <PageActions>
-          <Button
-            label={t("users.createButton")}
-            link="/users/add"
-            color="primary"
-          />
-        </PageActions>
       </Page>
     );
   }
@@ -100,7 +93,18 @@ class Users extends React.Component<Props> {
   renderCreateButton() {
     const { t } = this.props;
     if (this.props.canAddUsers) {
-      return <CreateButton label={t("users.createButton")} link="/users/add" />;
+      return (
+        <>
+          <CreateButton label={t("users.createButton")} link="/users/add" />
+          <PageActions>
+            <Button
+              label={t("users.createButton")}
+              link="/users/add"
+              color="primary"
+            />
+          </PageActions>
+        </>
+      );
     } else {
       return;
     }