diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/Buttons.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/Buttons.tsx
index caa034d77c29f..ecfde9e97aa9b 100644
--- a/site/src/pages/WorkspacePage/WorkspaceActions/Buttons.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceActions/Buttons.tsx
@@ -63,7 +63,21 @@ export const StartButton: FC<ActionButtonPropsWithWorkspace> = ({
   disabled,
   tooltipText,
 }) => {
-  const buttonContent = (
+  let mainButton = (
+    <TopbarButton
+      startIcon={<PlayCircleOutlineIcon />}
+      onClick={() => handleAction()}
+      disabled={disabled || loading}
+    >
+      {loading ? <>Starting&hellip;</> : "Start"}
+    </TopbarButton>
+  );
+
+  if (tooltipText) {
+    mainButton = <Tooltip title={tooltipText}>{mainButton}</Tooltip>;
+  }
+
+  return (
     <ButtonGroup
       variant="outlined"
       sx={{
@@ -74,13 +88,7 @@ export const StartButton: FC<ActionButtonPropsWithWorkspace> = ({
       }}
       disabled={disabled}
     >
-      <TopbarButton
-        startIcon={<PlayCircleOutlineIcon />}
-        onClick={() => handleAction()}
-        disabled={disabled || loading}
-      >
-        {loading ? <>Starting&hellip;</> : "Start"}
-      </TopbarButton>
+      {mainButton}
       <BuildParametersPopover
         label="Start with build parameters"
         workspace={workspace}
@@ -89,12 +97,6 @@ export const StartButton: FC<ActionButtonPropsWithWorkspace> = ({
       />
     </ButtonGroup>
   );
-
-  return tooltipText ? (
-    <Tooltip title={tooltipText}>{buttonContent}</Tooltip>
-  ) : (
-    buttonContent
-  );
 };
 
 export const StopButton: FC<ActionButtonProps> = ({