diff --git a/locales/en/public.json b/locales/en/public.json
index e153c6746..9dc71b300 100644
--- a/locales/en/public.json
+++ b/locales/en/public.json
@@ -385,6 +385,7 @@
     "DIAGNOSTICS_CARD_TITLE": "Diagnostics",
     "DIAGNOSTICS_GC_BUTTON": "Invoke Garbage Collection",
     "DIAGNOSTICS_HEAP_DUMP_BUTTON": "Invoke Heap Dump",
+    "DIAGNOSTICS_HEAP_DUMP_BUTTON_DISABLED": "Heap Dump collection requires the Cryostat Agent",
     "DIAGNOSTICS_HEAP_REDIRECT_BUTTON": "View collected Heap Dumps",
     "DIAGNOSTICS_THREAD_DUMP_BUTTON": "Invoke Thread Dump",
     "DIAGNOSTICS_THREAD_DUMP_TABLE_TOOLTIP": "View captured Thread Dumps",
diff --git a/src/app/Dashboard/Diagnostics/DiagnosticsCard.tsx b/src/app/Dashboard/Diagnostics/DiagnosticsCard.tsx
index 64e0464ff..aefeaa8b8 100644
--- a/src/app/Dashboard/Diagnostics/DiagnosticsCard.tsx
+++ b/src/app/Dashboard/Diagnostics/DiagnosticsCard.tsx
@@ -43,6 +43,7 @@ import {
   Tooltip,
   Stack,
   StackItem,
+  ActionListItem,
 } from '@patternfly/react-core';
 import { ListIcon, WrenchIcon } from '@patternfly/react-icons';
 import * as React from 'react';
@@ -56,7 +57,9 @@ export const DiagnosticsCard: DashboardCardFC<DiagnosticsCardProps> = (props) =>
   const serviceContext = React.useContext(ServiceContext);
   const notifications = React.useContext(NotificationsContext);
   const addSubscription = useSubscriptions();
-  const [running, setRunning] = React.useState(false);
+  const [runningGc, setRunningGc] = React.useState(false);
+  const [runningThreadDump, setRunningThreadDump] = React.useState(false);
+  const [runningHeapDump, setRunningHeapDump] = React.useState(false);
   const [heapDumpReady, setHeapDumpReady] = React.useState(false);
   const [threadDumpReady, setThreadDumpReady] = React.useState(false);
   const [controlEnabled, setControlEnabled] = React.useState(false);
@@ -126,39 +129,39 @@ export const DiagnosticsCard: DashboardCardFC<DiagnosticsCardProps> = (props) =>
   }, [addSubscription, serviceContext.notificationChannel, setThreadDumpReady]);
 
   const handleGC = React.useCallback(() => {
-    setRunning(true);
+    setRunningGc(true);
     addSubscription(
       serviceContext.api.runGC(true).subscribe({
         error: (err) => handleError(t('DiagnosticsCard.KINDS.GC'), err),
-        complete: () => setRunning(false),
+        complete: () => setRunningGc(false),
       }),
     );
-  }, [addSubscription, serviceContext.api, handleError, setRunning, t]);
+  }, [addSubscription, serviceContext.api, handleError, setRunningGc, t]);
 
   const handleThreadDump = React.useCallback(() => {
-    setRunning(true);
+    setRunningThreadDump(true);
     addSubscription(
       serviceContext.api.runThreadDump(true).subscribe({
         error: (err) => handleError(t('DiagnosticsCard.KINDS.THREADS'), err),
         complete: () => {
-          setRunning(false);
+          setRunningThreadDump(false);
           setThreadDumpReady(true);
         },
       }),
     );
-  }, [addSubscription, serviceContext.api, handleError, setRunning, t]);
+  }, [addSubscription, serviceContext.api, handleError, setRunningThreadDump, t]);
 
   const handleHeapDump = React.useCallback(() => {
-    setRunning(true);
+    setRunningHeapDump(true);
     addSubscription(
       serviceContext.api.runHeapDump(true).subscribe({
         error: (err) => handleError(t('DiagnosticsCard.KINDS.HEAP_DUMP'), err),
         complete: () => {
-          setRunning(false);
+          setRunningHeapDump(false);
         },
       }),
     );
-  }, [addSubscription, serviceContext.api, handleError, setRunning, t]);
+  }, [addSubscription, serviceContext.api, handleError, setRunningHeapDump, t]);
 
   const header = React.useMemo(() => {
     return (
@@ -193,58 +196,73 @@ export const DiagnosticsCard: DashboardCardFC<DiagnosticsCardProps> = (props) =>
                 <Stack hasGutter>
                   <StackItem>
                     <ActionList>
-                      <Button
-                        variant="primary"
-                        onClick={handleGC}
-                        spinnerAriaValueText="Invoke GC"
-                        spinnerAriaLabel="invoke-gc"
-                        isLoading={running}
-                      >
-                        {t('DiagnosticsCard.DIAGNOSTICS_GC_BUTTON')}
-                      </Button>
+                      <ActionListItem>
+                        <Button
+                          variant="primary"
+                          onClick={handleGC}
+                          spinnerAriaValueText="Invoke GC"
+                          spinnerAriaLabel="invoke-gc"
+                          isLoading={runningGc}
+                        >
+                          {t('DiagnosticsCard.DIAGNOSTICS_GC_BUTTON')}
+                        </Button>
+                      </ActionListItem>
                     </ActionList>
                   </StackItem>
                   <StackItem>
                     <ActionList>
-                      <Button
-                        variant="primary"
-                        onClick={handleThreadDump}
-                        spinnerAriaValueText="Invoke Thread Dump"
-                        spinnerAriaLabel="invoke-thread-dump"
-                        isLoading={running}
-                      >
-                        {t('DiagnosticsCard.DIAGNOSTICS_THREAD_DUMP_BUTTON')}
-                      </Button>
-                      <Tooltip content={t('DiagnosticsCard.DIAGNOSTICS_THREAD_DUMP_TABLE_TOOLTIP')}>
+                      <ActionListItem>
                         <Button
                           variant="primary"
-                          isAriaDisabled={!threadDumpReady}
-                          component={(props) => <CryostatLink {...props} to="/thread-dumps" />}
-                          icon={<ListIcon />}
-                        />
-                      </Tooltip>
+                          onClick={handleThreadDump}
+                          spinnerAriaValueText="Invoke Thread Dump"
+                          spinnerAriaLabel="invoke-thread-dump"
+                          isLoading={runningThreadDump}
+                        >
+                          {t('DiagnosticsCard.DIAGNOSTICS_THREAD_DUMP_BUTTON')}
+                        </Button>
+                      </ActionListItem>
+                      <ActionListItem>
+                        <Tooltip content={t('DiagnosticsCard.DIAGNOSTICS_THREAD_DUMP_TABLE_TOOLTIP')}>
+                          <Button
+                            variant="primary"
+                            isAriaDisabled={!threadDumpReady}
+                            component={(props) => <CryostatLink {...props} to="/thread-dumps" />}
+                            icon={<ListIcon />}
+                          />
+                        </Tooltip>
+                      </ActionListItem>
                     </ActionList>
                   </StackItem>
                   <StackItem>
                     <ActionList>
-                      <Button
-                        variant="primary"
-                        onClick={handleHeapDump}
-                        isAriaDisabled={!controlEnabled}
-                        spinnerAriaValueText="Invoke Heap Dump"
-                        spinnerAriaLabel="invoke-heap-dump"
-                        isLoading={running}
-                      >
-                        {t('DiagnosticsCard.DIAGNOSTICS_HEAP_DUMP_BUTTON')}
-                      </Button>
-                      <Tooltip content={t('DiagnosticsCard.DIAGNOSTICS_HEAP_REDIRECT_BUTTON')}>
-                        <Button
-                          variant="primary"
-                          isAriaDisabled={!(heapDumpReady && controlEnabled)}
-                          component={(props) => <CryostatLink {...props} to="/heapdumps" />}
-                          icon={<ListIcon />}
-                        />
-                      </Tooltip>
+                      <ActionListItem>
+                        <Tooltip
+                          trigger={controlEnabled ? 'manual' : 'mouseenter focus'}
+                          content={t('DiagnosticsCard.DIAGNOSTICS_HEAP_DUMP_BUTTON_DISABLED')}
+                        >
+                          <Button
+                            variant="primary"
+                            onClick={handleHeapDump}
+                            isAriaDisabled={!controlEnabled}
+                            spinnerAriaValueText="Invoke Heap Dump"
+                            spinnerAriaLabel="invoke-heap-dump"
+                            isLoading={runningHeapDump}
+                          >
+                            {t('DiagnosticsCard.DIAGNOSTICS_HEAP_DUMP_BUTTON')}
+                          </Button>
+                        </Tooltip>
+                      </ActionListItem>
+                      <ActionListItem>
+                        <Tooltip content={t('DiagnosticsCard.DIAGNOSTICS_HEAP_REDIRECT_BUTTON')}>
+                          <Button
+                            variant="primary"
+                            isAriaDisabled={!(heapDumpReady && controlEnabled)}
+                            component={(props) => <CryostatLink {...props} to="/heapdumps" />}
+                            icon={<ListIcon />}
+                          />
+                        </Tooltip>
+                      </ActionListItem>
                     </ActionList>
                   </StackItem>
                 </Stack>
diff --git a/src/app/Diagnostics/CaptureDiagnostics.tsx b/src/app/Diagnostics/CaptureDiagnostics.tsx
index 3d89eb1ac..ce5cd0f6e 100644
--- a/src/app/Diagnostics/CaptureDiagnostics.tsx
+++ b/src/app/Diagnostics/CaptureDiagnostics.tsx
@@ -23,6 +23,7 @@ import { useSubscriptions } from '@app/utils/hooks/useSubscriptions';
 import { useCryostatTranslation } from '@i18n/i18nextUtil';
 import {
   ActionList,
+  ActionListItem,
   Bullseye,
   Button,
   Card,
@@ -44,7 +45,9 @@ export const CaptureDiagnostics: React.FC<CaptureDiagnosticsProps> = ({ ...props
   const serviceContext = React.useContext(ServiceContext);
   const notifications = React.useContext(NotificationsContext);
   const addSubscription = useSubscriptions();
-  const [running, setRunning] = React.useState(false);
+  const [runningGc, setRunningGc] = React.useState(false);
+  const [runningThreadDump, setRunningThreadDump] = React.useState(false);
+  const [runningHeapDump, setRunningHeapDump] = React.useState(false);
   const [threadDumpReady, setThreadDumpReady] = React.useState(false);
   const [heapDumpReady, setHeapDumpReady] = React.useState(false);
   const [controlEnabled, setControlEnabled] = React.useState(false);
@@ -107,40 +110,40 @@ export const CaptureDiagnostics: React.FC<CaptureDiagnosticsProps> = ({ ...props
   }, [addSubscription, serviceContext.notificationChannel, setThreadDumpReady]);
 
   const handleGC = React.useCallback(() => {
-    setRunning(true);
+    setRunningGc(true);
     addSubscription(
       serviceContext.api.runGC(true).subscribe({
         error: (err) => handleError(t('DiagnosticsCard.KINDS.GC'), err),
-        complete: () => setRunning(false),
+        complete: () => setRunningGc(false),
       }),
     );
-  }, [addSubscription, serviceContext.api, handleError, setRunning, t]);
+  }, [addSubscription, serviceContext.api, handleError, setRunningGc, t]);
 
   const handleThreadDump = React.useCallback(() => {
-    setRunning(true);
+    setRunningThreadDump(true);
     addSubscription(
       serviceContext.api.runThreadDump(true).subscribe({
         error: (err) => handleError(t('DiagnosticsCard.KINDS.THREADS'), err),
         complete: () => {
-          setRunning(false);
+          setRunningThreadDump(false);
           setThreadDumpReady(true);
         },
       }),
     );
-  }, [addSubscription, serviceContext.api, handleError, setRunning, t]);
+  }, [addSubscription, serviceContext.api, handleError, setRunningThreadDump, t]);
 
   const handleHeapDump = React.useCallback(() => {
-    setRunning(true);
+    setRunningHeapDump(true);
     addSubscription(
       serviceContext.api.runHeapDump(true).subscribe({
         error: (err) => handleError(t('DiagnosticsCard.KINDS.HEAP_DUMP'), err),
         complete: () => {
-          setRunning(false);
+          setRunningHeapDump(false);
           setHeapDumpReady(true);
         },
       }),
     );
-  }, [addSubscription, serviceContext.api, handleError, setRunning, t]);
+  }, [addSubscription, serviceContext.api, handleError, setRunningHeapDump, t]);
 
   return (
     <TargetView {...props} pageTitle="Diagnostics">
@@ -152,58 +155,73 @@ export const CaptureDiagnostics: React.FC<CaptureDiagnosticsProps> = ({ ...props
                 <Stack hasGutter>
                   <StackItem>
                     <ActionList>
-                      <Button
-                        variant="primary"
-                        onClick={handleGC}
-                        spinnerAriaValueText="Invoke GC"
-                        spinnerAriaLabel="invoke-gc"
-                        isLoading={running}
-                      >
-                        {t('DiagnosticsCard.DIAGNOSTICS_GC_BUTTON')}
-                      </Button>
+                      <ActionListItem>
+                        <Button
+                          variant="primary"
+                          onClick={handleGC}
+                          spinnerAriaValueText="Invoke GC"
+                          spinnerAriaLabel="invoke-gc"
+                          isLoading={runningGc}
+                        >
+                          {t('DiagnosticsCard.DIAGNOSTICS_GC_BUTTON')}
+                        </Button>
+                      </ActionListItem>
                     </ActionList>
                   </StackItem>
                   <StackItem>
                     <ActionList>
-                      <Button
-                        variant="primary"
-                        onClick={handleThreadDump}
-                        spinnerAriaValueText="Invoke Thread Dump"
-                        spinnerAriaLabel="invoke-thread-dump"
-                        isLoading={running}
-                      >
-                        {t('DiagnosticsCard.DIAGNOSTICS_THREAD_DUMP_BUTTON')}
-                      </Button>
-                      <Tooltip content={t('DiagnosticsCard.DIAGNOSTICS_THREAD_DUMP_TABLE_TOOLTIP')}>
+                      <ActionListItem>
                         <Button
                           variant="primary"
-                          isAriaDisabled={!threadDumpReady}
-                          component={(props) => <CryostatLink {...props} to="/thread-dumps" />}
-                          icon={<ListIcon />}
-                        />
-                      </Tooltip>
+                          onClick={handleThreadDump}
+                          spinnerAriaValueText="Invoke Thread Dump"
+                          spinnerAriaLabel="invoke-thread-dump"
+                          isLoading={runningThreadDump}
+                        >
+                          {t('DiagnosticsCard.DIAGNOSTICS_THREAD_DUMP_BUTTON')}
+                        </Button>
+                      </ActionListItem>
+                      <ActionListItem>
+                        <Tooltip content={t('DiagnosticsCard.DIAGNOSTICS_THREAD_DUMP_TABLE_TOOLTIP')}>
+                          <Button
+                            variant="primary"
+                            isAriaDisabled={!threadDumpReady}
+                            component={(props) => <CryostatLink {...props} to="/thread-dumps" />}
+                            icon={<ListIcon />}
+                          />
+                        </Tooltip>
+                      </ActionListItem>
                     </ActionList>
                   </StackItem>
                   <StackItem>
                     <ActionList>
-                      <Button
-                        variant="primary"
-                        isAriaDisabled={!controlEnabled}
-                        onClick={handleHeapDump}
-                        spinnerAriaValueText="Invoke Heap Dump"
-                        spinnerAriaLabel="invoke-heap-dump"
-                        isLoading={running}
-                      >
-                        {t('DiagnosticsCard.DIAGNOSTICS_HEAP_DUMP_BUTTON')}
-                      </Button>
-                      <Tooltip content={t('DiagnosticsCard.DIAGNOSTICS_HEAP_REDIRECT_BUTTON')}>
-                        <Button
-                          variant="primary"
-                          isAriaDisabled={!heapDumpReady}
-                          component={(props) => <CryostatLink {...props} to="/heapdumps" />}
-                          icon={<ListIcon />}
-                        />
-                      </Tooltip>
+                      <ActionListItem>
+                        <Tooltip
+                          trigger={controlEnabled ? 'manual' : 'mouseenter focus'}
+                          content={t('DiagnosticsCard.DIAGNOSTICS_HEAP_DUMP_BUTTON_DISABLED')}
+                        >
+                          <Button
+                            variant="primary"
+                            isAriaDisabled={!controlEnabled}
+                            onClick={handleHeapDump}
+                            spinnerAriaValueText="Invoke Heap Dump"
+                            spinnerAriaLabel="invoke-heap-dump"
+                            isLoading={runningHeapDump}
+                          >
+                            {t('DiagnosticsCard.DIAGNOSTICS_HEAP_DUMP_BUTTON')}
+                          </Button>
+                        </Tooltip>
+                      </ActionListItem>
+                      <ActionListItem>
+                        <Tooltip content={t('DiagnosticsCard.DIAGNOSTICS_HEAP_REDIRECT_BUTTON')}>
+                          <Button
+                            variant="primary"
+                            isAriaDisabled={!heapDumpReady}
+                            component={(props) => <CryostatLink {...props} to="/heapdumps" />}
+                            icon={<ListIcon />}
+                          />
+                        </Tooltip>
+                      </ActionListItem>
                     </ActionList>
                   </StackItem>
                 </Stack>