diff --git a/app/next-client-app/components/scanreports/EditButton.tsx b/app/next-client-app/components/scanreports/EditButton.tsx
index 60e1d9f5e..49c797ee4 100644
--- a/app/next-client-app/components/scanreports/EditButton.tsx
+++ b/app/next-client-app/components/scanreports/EditButton.tsx
@@ -1,6 +1,8 @@
 import Link from "next/link";
 import { Button } from "../ui/button";
 import { Pencil } from "lucide-react";
+import { Tooltips } from "../Tooltips";
+import { cn } from "@/lib/utils";
 
 export function EditButton({
   scanreportId,
@@ -9,6 +11,7 @@ export function EditButton({
   type,
   permissions,
   prePath,
+  generalStatus,
 }: {
   scanreportId?: number;
   tableId?: number;
@@ -16,39 +19,34 @@ export function EditButton({
   prePath?: string;
   type: string;
   permissions: Permission[];
+  generalStatus?: string;
 }) {
   const canEdit =
-    permissions.includes("CanEdit") || permissions.includes("CanAdmin");
+    (permissions.includes("CanEdit") || permissions.includes("CanAdmin")) &&
+    generalStatus != "IN_PROGRESS";
   return (
     <Link
       href={
         canEdit
-          ? type === "table" || type === "table-row"
+          ? type === "table"
             ? `/scanreports/${scanreportId}/tables/${tableId}/update`
             : type === "field"
             ? `${prePath}/fields/${fieldID}/update`
             : ""
           : ""
       }
-      className={canEdit ? "cursor-pointer" : "cursor-not-allowed"}
+      className={cn(canEdit ? "cursor-pointer" : "cursor-not-allowed", "flex")}
     >
       <Button
-        variant={
-          type === "table" || type === "field"
-            ? "secondary"
-            : type === "table-row"
-            ? "outline"
-            : "default"
-        }
+        variant={type === "table" || type === "field" ? "secondary" : "default"}
         disabled={canEdit ? false : true}
       >
-        {type === "table" || type === "table-row"
-          ? "Edit Table"
-          : type === "field"
-          ? "Edit Field"
-          : ""}
+        {type === "table" ? "Edit Table" : type === "field" ? "Edit Field" : ""}
         <Pencil className="ml-2 size-4" />
       </Button>
+      {generalStatus == "IN_PROGRESS" && (
+        <Tooltips content="You can update the table after jobs running in this scan report finished." />
+      )}
     </Link>
   );
 }