diff --git a/static/app/views/issueDetails/streamline/sidebar/autofixSection.spec.tsx b/static/app/views/issueDetails/streamline/sidebar/autofixSection.spec.tsx
index 4a38bceec60182..306cf8b9532334 100644
--- a/static/app/views/issueDetails/streamline/sidebar/autofixSection.spec.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/autofixSection.spec.tsx
@@ -161,10 +161,6 @@ describe('AutofixSection', () => {
     expect(await screen.findByText('Root Cause')).toBeInTheDocument();
     expect(screen.getByText('Null pointer in user handler')).toBeInTheDocument();
     expect(screen.getByRole('button', {name: 'Open Autofix'})).toBeInTheDocument();
-    expect(screen.getByRole('button', {name: 'Open Autofix'})).toHaveAttribute(
-      'href',
-      expect.stringContaining('seerDrawer=true')
-    );
   });
 
   it('renders solution artifact', async () => {
@@ -568,9 +564,5 @@ describe('AutofixSection', () => {
     expect(screen.getByText('Outline a plan')).toBeInTheDocument();
     expect(screen.getByText('Create a code fix')).toBeInTheDocument();
     expect(screen.getByRole('button', {name: 'Start Analysis'})).toBeInTheDocument();
-    expect(screen.getByRole('button', {name: 'Start Analysis'})).toHaveAttribute(
-      'href',
-      expect.stringContaining('seerDrawer=true')
-    );
   });
 });
diff --git a/static/app/views/issueDetails/streamline/sidebar/autofixSection.tsx b/static/app/views/issueDetails/streamline/sidebar/autofixSection.tsx
index 46e88825f8d538..619ab8ef88f915 100644
--- a/static/app/views/issueDetails/streamline/sidebar/autofixSection.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/autofixSection.tsx
@@ -1,10 +1,10 @@
-import {type CSSProperties, useMemo} from 'react';
+import {type CSSProperties, useMemo, useState} from 'react';
 import styled from '@emotion/styled';
 import {useQuery} from '@tanstack/react-query';
 
 import seerConfigConnectImg from 'sentry-images/spot/seer-config-connect-2.svg';
 
-import {LinkButton} from '@sentry/scraps/button';
+import {Button, LinkButton} from '@sentry/scraps/button';
 import {Image} from '@sentry/scraps/image';
 import {Container, Flex} from '@sentry/scraps/layout';
 import {Text} from '@sentry/scraps/text';
@@ -33,6 +33,7 @@ import {
 import {useAutoTriggerAutofix} from 'sentry/components/events/autofix/v3/useAutoTriggerAutofix';
 import {useGroupSummaryData} from 'sentry/components/group/groupSummary';
 import {HookOrDefault} from 'sentry/components/hookOrDefault';
+import {LoadingIndicator} from 'sentry/components/loadingIndicator';
 import {Placeholder} from 'sentry/components/placeholder';
 import {IconBug} from 'sentry/icons';
 import {IconSeer} from 'sentry/icons/iconSeer';
@@ -43,7 +44,6 @@ import type {Project} from 'sentry/types/project';
 import {getSeerOnboardingCheckQueryOptions} from 'sentry/utils/getSeerOnboardingCheckQueryOptions';
 import {getConfigForIssueType} from 'sentry/utils/issueTypeConfig';
 import {useRouteAnalyticsParams} from 'sentry/utils/routeAnalytics/useRouteAnalyticsParams';
-import {useLocation} from 'sentry/utils/useLocation';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {SectionKey} from 'sentry/views/issueDetails/streamline/context';
 import {SidebarFoldSection} from 'sentry/views/issueDetails/streamline/foldSection';
@@ -249,8 +249,6 @@ function AutofixEmptyState({
   project,
   referrer,
 }: AutofixEmptyStateProps) {
-  const seerDrawerLink = useSeerDrawerLink();
-
   const {openSeerDrawer} = useOpenSeerDrawer({
     group,
     project,
@@ -260,8 +258,16 @@ function AutofixEmptyState({
   // extract startStep first here so we can depend on it directly as `autofix` itself is unstable.
   const startStep = autofix.startStep;
 
-  const handleStartRootCause = () => {
-    startStep('root_cause');
+  const [startingRun, setStartingRun] = useState(false);
+  const handleStartRootCause = async () => {
+    setStartingRun(true);
+    try {
+      await startStep('root_cause');
+    } catch {
+      return;
+    } finally {
+      setStartingRun(false);
+    }
     openSeerDrawer();
   };
 
@@ -292,19 +298,19 @@ function AutofixEmptyState({
           <Image src={seerConfigConnectImg} alt="" width="auto" height="100%" />
         </ImageContainer>
       </Flex>
-      <LinkButton
+      <Button
         size="md"
-        icon={<IconBug />}
+        icon={startingRun ? <LoadingIndicator size={16} /> : <IconBug />}
         aria-label={t('Start Analysis')}
         variant="primary"
-        to={seerDrawerLink}
         onClick={handleStartRootCause}
         analyticsEventKey="autofix.start_fix_clicked"
         analyticsEventName="Autofix: Start Fix Clicked"
         analyticsParams={{group_id: group.id, mode: 'explorer', referrer}}
+        disabled={startingRun}
       >
         {t('Start Analysis')}
-      </LinkButton>
+      </Button>
     </Flex>
   );
 }
@@ -324,8 +330,6 @@ function AutofixPreviews({
   sections,
   referrer,
 }: AutofixPreviewsProps) {
-  const seerDrawerLink = useSeerDrawerLink();
-
   const hasRootCause =
     sections.findLast(isRootCauseSection)?.artifacts?.some(isRootCauseArtifact) ?? false;
 
@@ -384,12 +388,11 @@ function AutofixPreviews({
         // TODO: maybe send a log?
         return null;
       })}
-      <LinkButton
+      <Button
         size="md"
         icon={<IconSeer />}
         aria-label={t('Open Autofix')}
         variant="primary"
-        to={seerDrawerLink}
         onClick={openSeerDrawer}
         analyticsEventKey="issue_details.seer_opened"
         analyticsEventName="Issue Details: Seer Opened"
@@ -408,22 +411,11 @@ function AutofixPreviews({
         }}
       >
         {t('Open Autofix')}
-      </LinkButton>
+      </Button>
     </Flex>
   );
 }
 
-function useSeerDrawerLink() {
-  const location = useLocation();
-  return {
-    pathname: location.pathname,
-    query: {
-      ...location.query,
-      seerDrawer: true,
-    },
-  };
-}
-
 const ImageContainer = styled(Flex)<{
   aspectRatio?: CSSProperties['aspectRatio'];
 }>`
diff --git a/static/app/views/issueDetails/streamline/sidebar/seerDrawer.tsx b/static/app/views/issueDetails/streamline/sidebar/seerDrawer.tsx
index 68a4f792e34a5d..f5d0186a7d244d 100644
--- a/static/app/views/issueDetails/streamline/sidebar/seerDrawer.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/seerDrawer.tsx
@@ -83,6 +83,16 @@ export const useOpenSeerDrawer = ({
         );
       },
     });
+
+    if (locationRef.current.query.seerDrawer !== 'true') {
+      navigate({
+        pathname: locationRef.current.pathname,
+        query: {
+          ...locationRef.current.query,
+          seerDrawer: true,
+        },
+      });
+    }
   }, [openDrawer, event, group, project, navigate, organization]);
 
   return {openSeerDrawer};