diff --git a/src/components/CreateSecret/ServiceAccountSelector.js b/src/components/CreateSecret/ServiceAccountSelector.js
index e8bf7edd8..515b4aa1a 100644
--- a/src/components/CreateSecret/ServiceAccountSelector.js
+++ b/src/components/CreateSecret/ServiceAccountSelector.js
@@ -16,7 +16,7 @@ import { injectIntl } from 'react-intl';
 
 import { Table } from '@tektoncd/dashboard-components';
 import { getErrorMessage } from '@tektoncd/dashboard-utils';
-import { Button, InlineNotification } from 'carbon-components-react';
+import { InlineNotification } from 'carbon-components-react';
 import { DataConnected24 as Patch } from '@carbon/icons-react';
 
 const ServiceAccountSelector = props => {
@@ -80,15 +80,6 @@ const ServiceAccountSelector = props => {
             { name }
           )}
         </h1>
-        <Button
-          iconDescription={intl.formatMessage({
-            id: 'dashboard.createSecret.finishButton',
-            defaultMessage: 'Finish'
-          })}
-          onClick={handleClose}
-        >
-          Finish
-        </Button>
       </div>
       <div>
         <p>
@@ -118,6 +109,15 @@ const ServiceAccountSelector = props => {
           },
           { kind: 'Secrets', selectedNamespace: namespace }
         )}
+        toolbarButtons={[
+          {
+            onClick: handleClose,
+            text: intl.formatMessage({
+              id: 'dashboard.createSecret.finishButton',
+              defaultMessage: 'Finish'
+            })
+          }
+        ]}
         batchActionButtons={[
           {
             onClick: serviceAccountsSelected => {