diff --git a/client/src/components/Agents/AgentDetail.tsx b/client/src/components/Agents/AgentDetail.tsx
index 1820eed8b9..4f71bb114f 100644
--- a/client/src/components/Agents/AgentDetail.tsx
+++ b/client/src/components/Agents/AgentDetail.tsx
@@ -183,7 +183,12 @@ const AgentDetail: React.FC<AgentDetailProps> = ({ agent, isOpen, onClose }) =>
           >
             <Link className="h-4 w-4" aria-hidden="true" />
           </Button>
-          <Button className="w-full max-w-xs" onClick={handleStartChat} disabled={!agent}>
+          <Button
+            variant="submit"
+            className="w-full max-w-xs"
+            onClick={handleStartChat}
+            disabled={!agent}
+          >
             {localize('com_agents_start_chat')}
           </Button>
         </div>
diff --git a/client/src/components/Agents/AgentDetailContent.tsx b/client/src/components/Agents/AgentDetailContent.tsx
index 1e06d8230f..7a2a95401d 100644
--- a/client/src/components/Agents/AgentDetailContent.tsx
+++ b/client/src/components/Agents/AgentDetailContent.tsx
@@ -181,7 +181,12 @@ const AgentDetailContent: React.FC<AgentDetailContentProps> = ({ agent }) => {
         >
           <Link className="h-4 w-4" aria-hidden="true" />
         </Button>
-        <Button className="w-full max-w-xs" onClick={handleStartChat} disabled={!agent}>
+        <Button
+          variant="submit"
+          className="w-full max-w-xs"
+          onClick={handleStartChat}
+          disabled={!agent}
+        >
           {localize('com_agents_start_chat')}
         </Button>
       </div>
diff --git a/client/src/components/Sharing/GenericGrantAccessDialog.tsx b/client/src/components/Sharing/GenericGrantAccessDialog.tsx
index d9270ef2d3..ce7fdbdc14 100644
--- a/client/src/components/Sharing/GenericGrantAccessDialog.tsx
+++ b/client/src/components/Sharing/GenericGrantAccessDialog.tsx
@@ -401,6 +401,7 @@ export default function GenericGrantAccessDialog({
                 </Button>
               </OGDialogClose>
               <Button
+                variant="submit"
                 onClick={handleSave}
                 disabled={
                   updatePermissionsMutation.isLoading ||