diff --git a/apps/visr/src/components/AbortButton.tsx b/apps/visr/src/components/AbortButton.tsx
index bfa3fcb..648134b 100644
--- a/apps/visr/src/components/AbortButton.tsx
+++ b/apps/visr/src/components/AbortButton.tsx
@@ -1,12 +1,26 @@
 import { Button } from "@mui/material";
+import { useEffect, useState } from "react";
 
 import { setWorkerState, type WorkerRequest } from "../utils/api";
+import { useScanEvents } from "../hooks/scanEvents";
 
 const AbortButton = () => {
+  const [disabled, setDisabled] = useState<boolean>(true);
+  const scanEvent = useScanEvents();
+  useEffect(() => {
+    if (!scanEvent) return;
+    if (scanEvent.status == "running") {
+      setDisabled(false);
+    }
+    if (scanEvent.status == "finished" || scanEvent.status == "failed") {
+      setDisabled(true);
+    }
+  }, [scanEvent]);
   return (
     <Button
       variant="contained"
       color="error"
+      disabled={disabled}
       sx={{ width: "150px" }}
       onClick={async () => {
         const workerRequest: WorkerRequest = {
diff --git a/apps/visr/src/components/PlanBrowser/PlanParameters.test.tsx b/apps/visr/src/components/PlanBrowser/PlanParameters.test.tsx
index cb7f3e7..51b5fbc 100644
--- a/apps/visr/src/components/PlanBrowser/PlanParameters.test.tsx
+++ b/apps/visr/src/components/PlanBrowser/PlanParameters.test.tsx
@@ -14,6 +14,8 @@ vi.mock("@jsonforms/react", () => {
   };
 });
 
+vi.mock("../../hooks/scanEvents");
+
 const plan: Plan = {
   name: "hi_plan",
   description: "Says hi to you",
diff --git a/apps/visr/src/components/RunPlanButton.tsx b/apps/visr/src/components/RunPlanButton.tsx
index f4f477d..2c46cbd 100644
--- a/apps/visr/src/components/RunPlanButton.tsx
+++ b/apps/visr/src/components/RunPlanButton.tsx
@@ -1,6 +1,8 @@
 import { Button } from "@mui/material";
+import { useEffect, useState } from "react";
 
 import { createAndStartTask, type TaskRequest } from "../utils/api";
+import { useScanEvents } from "../hooks/scanEvents";
 
 type RunPlanButtonProps = {
   name: string;
@@ -13,9 +15,26 @@ const RunPlanButton = ({
   params,
   instrumentSession,
 }: RunPlanButtonProps) => {
+  const [loading, setLoading] = useState<boolean>(false);
+  const [disabled, setDisabled] = useState<boolean>(false);
+  const scanEvent = useScanEvents();
+  useEffect(() => {
+    if (!scanEvent) {
+      setDisabled(false);
+      return;
+    }
+    if (scanEvent.status == "running") {
+      setDisabled(true);
+    }
+    if (scanEvent.status == "finished" || scanEvent.status == "failed") {
+      setDisabled(false);
+    }
+  }, [scanEvent]);
   return (
     <Button
       variant="contained"
+      loading={loading}
+      disabled={disabled}
       sx={{ width: "150px" }}
       onClick={async () => {
         const taskRequest: TaskRequest = {
@@ -23,7 +42,9 @@ const RunPlanButton = ({
           params: params,
           instrument_session: instrumentSession,
         };
+        setLoading(true);
         await createAndStartTask(taskRequest);
+        setLoading(false);
       }}
     >
       Run