diff --git a/apps/nextjs/src/components/board/items/item-content.tsx b/apps/nextjs/src/components/board/items/item-content.tsx
index c82e94e8e..c78dc0baa 100644
--- a/apps/nextjs/src/components/board/items/item-content.tsx
+++ b/apps/nextjs/src/components/board/items/item-content.tsx
@@ -59,32 +59,32 @@ export const BoardItemContent = ({ item }: BoardItemContentProps) => {
   );
 
   return (
-    <>
-      <WidgetContextMenu item={item} widgetStateRef={widgetStateRef}>
+    <WidgetContextMenu item={item} widgetStateRef={widgetStateRef}>
+      <div style={{ position: "relative" }}>
         {cardElement}
-      </WidgetContextMenu>
-      {item.advancedOptions.title?.trim() && (
-        <Badge
-          pos="absolute"
-          // It's 4 because of the mantine-react-table that has z-index 3
-          style={{ zIndex: 4 }}
-          top={2}
-          left={16}
-          size="xs"
-          radius={board.itemRadius}
-          styles={{
-            root: {
-              "--border-color": item.advancedOptions.borderColor !== "" ? item.advancedOptions.borderColor : undefined,
-              "--opacity": board.opacity / 100,
-            },
-          }}
-          className={itemContentClasses.badge}
-          c="var(--mantine-color-text)"
-        >
-          {item.advancedOptions.title}
-        </Badge>
-      )}
-    </>
+        {item.advancedOptions.title?.trim() && (
+          <Badge
+            pos="absolute"
+            // It's 4 because of the mantine-react-table that has z-index 3
+            style={{ zIndex: 4 }}
+            top={2}
+            left={16}
+            size="xs"
+            radius={board.itemRadius}
+            styles={{
+              root: {
+                "--border-color": item.advancedOptions.borderColor !== "" ? item.advancedOptions.borderColor : undefined,
+                "--opacity": board.opacity / 100,
+              },
+            }}
+            className={itemContentClasses.badge}
+            c="var(--mantine-color-text)"
+          >
+            {item.advancedOptions.title}
+          </Badge>
+        )}
+      </div>
+    </WidgetContextMenu>
   );
 };
 
diff --git a/apps/nextjs/src/components/board/items/widget-context-menu.tsx b/apps/nextjs/src/components/board/items/widget-context-menu.tsx
index 4a3b87cf1..a4602ed40 100644
--- a/apps/nextjs/src/components/board/items/widget-context-menu.tsx
+++ b/apps/nextjs/src/components/board/items/widget-context-menu.tsx
@@ -153,6 +153,7 @@ export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetCont
         label: tItem("action.edit"),
         icon: IconPencil,
         onClick: openEditModal,
+        disabled: isPending,
       });
       actions.push({
         key: "moveResize",
@@ -191,6 +192,7 @@ export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetCont
     return actions.filter((a) => !a.hidden);
   }, [
     isEditMode,
+    isPending,
     autoToggleActions,
     widgetContextActions,
     openEditModal,
@@ -202,8 +204,6 @@ export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetCont
     duplicateItem,
   ]);
 
-  if (isPending) return <>{children}</>;
-
   return (
     <Menu shadow="md" width={200}>
       <Menu.ContextMenu>{children}</Menu.ContextMenu>