diff --git a/app/layout/project/sidebar/project/inventory-panel/components/inventory-table/row-item/index.tsx b/app/layout/project/sidebar/project/inventory-panel/components/inventory-table/row-item/index.tsx
index 81e5f89084..e8860ee0be 100644
--- a/app/layout/project/sidebar/project/inventory-panel/components/inventory-table/row-item/index.tsx
+++ b/app/layout/project/sidebar/project/inventory-panel/components/inventory-table/row-item/index.tsx
@@ -67,13 +67,20 @@ const RowItem = ({
               icon={isVisibleOnMap ? SHOW_SVG : HIDE_SVG}
             />
           </button>
-          {isCustom && (
-            <Popover>
-              <PopoverTrigger asChild>
-                <button type="button" className="h-5 w-5">
-                  <MoreHorizontal className="h-4 w-4 text-white" />
-                </button>
-              </PopoverTrigger>
+
+          <Popover>
+            <PopoverTrigger asChild>
+              <button
+                type="button"
+                className={cn({
+                  'h-5 w-5': true,
+                  invisible: !isCustom,
+                })}
+              >
+                <MoreHorizontal className="h-4 w-4 text-white" />
+              </button>
+            </PopoverTrigger>
+            {isCustom && (
               <PopoverContent
                 className="w-auto rounded-2xl border-transparent p-0"
                 side="bottom"
@@ -82,8 +89,8 @@ const RowItem = ({
               >
                 <ActionsComponent item={item} />
               </PopoverContent>
-            </Popover>
-          )}
+            )}
+          </Popover>
         </div>
       </td>
     </tr>
diff --git a/app/layout/project/sidebar/project/inventory-panel/wdpas/index.tsx b/app/layout/project/sidebar/project/inventory-panel/wdpas/index.tsx
index a294b17074..111df2a181 100644
--- a/app/layout/project/sidebar/project/inventory-panel/wdpas/index.tsx
+++ b/app/layout/project/sidebar/project/inventory-panel/wdpas/index.tsx
@@ -117,20 +117,22 @@ const InventoryPanelProtectedAreas = ({
   }));
 
   return (
-    <div className="space-y-6">
-      <InventoryTable
-        loading={allProjectWDPAsQuery.isFetching}
-        data={data}
-        noDataMessage={noDataMessage}
-        columns={WDPA_TABLE_COLUMNS}
-        sorting={filters.sort}
-        selectedIds={selectedWDPAIds}
-        onSortChange={handleSort}
-        onSelectAll={handleSelectAll}
-        onSelectRow={handleSelectWDPA}
-        onToggleSeeOnMap={toggleSeeOnMap}
-        ActionsComponent={ActionsMenu}
-      />
+    <div className="flex flex-col space-y-6 overflow-hidden">
+      <div className="h-full overflow-hidden">
+        <InventoryTable
+          loading={allProjectWDPAsQuery.isFetching}
+          data={data}
+          noDataMessage={noDataMessage}
+          columns={WDPA_TABLE_COLUMNS}
+          sorting={filters.sort}
+          selectedIds={selectedWDPAIds}
+          onSortChange={handleSort}
+          onSelectAll={handleSelectAll}
+          onSelectRow={handleSelectWDPA}
+          onToggleSeeOnMap={toggleSeeOnMap}
+          ActionsComponent={ActionsMenu}
+        />
+      </div>
       {displayBulkActions && <WDPABulkActionMenu selectedWDPAIds={selectedWDPAIds} />}
     </div>
   );