diff --git a/src/pages/sponsors-global/form-templates/__tests__/sponsor-inventory-popup.test.js b/src/pages/sponsors-global/form-templates/__tests__/sponsor-inventory-popup.test.js
new file mode 100644
index 000000000..08e4b7d4d
--- /dev/null
+++ b/src/pages/sponsors-global/form-templates/__tests__/sponsor-inventory-popup.test.js
@@ -0,0 +1,326 @@
+import React from "react";
+import { render, screen, waitFor, fireEvent } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import "@testing-library/jest-dom";
+import SponsorItemDialog from "../sponsor-inventory-popup";
+
+jest.mock("i18n-react/dist/i18n-react", () => ({
+  translate: jest.fn((key) => key)
+}));
+
+jest.mock("../../../../hooks/useScrollToError", () => jest.fn());
+
+jest.mock(
+  "openstack-uicore-foundation/lib/components/mui/formik-inputs/upload",
+  () =>
+    function MockMuiFormikUpload({ name, onDelete }) {
+      return (
+        <div data-testid={`upload-${name}`}>
+          <button type="button" onClick={() => onDelete(5)}>
+            delete-persisted-image
+          </button>
+          <button type="button" onClick={() => onDelete(undefined)}>
+            delete-unsaved-image
+          </button>
+        </div>
+      );
+    }
+);
+
+jest.mock(
+  "openstack-uicore-foundation/lib/components/mui/formik-inputs/additional-input-list",
+  () =>
+    function MockAdditionalInputList({ name }) {
+      return <div data-testid={`meta-fields-${name}`} />;
+    }
+);
+
+jest.mock(
+  "../../../../components/mui/formik-inputs/item-price-tiers",
+  () =>
+    function MockItemPriceTiers() {
+      return <div data-testid="price-tiers" />;
+    }
+);
+
+jest.mock(
+  "../../../../components/inputs/formik-text-editor",
+  () =>
+    function MockFormikTextEditor({ name }) {
+      return <textarea data-testid={`editor-${name}`} name={name} readOnly />;
+    }
+);
+
+const BASE_ENTITY = {
+  id: 0,
+  code: "",
+  name: "",
+  description: "",
+  early_bird_rate: "",
+  standard_rate: "",
+  onsite_rate: "",
+  quantity_limit_per_show: "",
+  quantity_limit_per_sponsor: "",
+  meta_fields: [],
+  images: []
+};
+
+const fillRequiredTextFields = async (user) => {
+  await user.type(document.querySelector("input[name=\"code\"]"), "CODE-1");
+  await user.type(document.querySelector("input[name=\"name\"]"), "Item 1");
+};
+
+const submit = async (user) => {
+  await user.click(
+    screen.getByRole("button", { name: "edit_inventory_item.save_changes" })
+  );
+};
+
+describe("SponsorItemDialog", () => {
+  let onSave;
+  let onClose;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    onSave = jest.fn(() => Promise.resolve());
+    onClose = jest.fn();
+  });
+
+  it("titles itself by whether the entity has an id", () => {
+    const { rerender } = render(
+      <SponsorItemDialog
+        entity={BASE_ENTITY}
+        onSave={onSave}
+        onClose={onClose}
+      />
+    );
+    expect(
+      screen.getByText("edit_inventory_item.new_item")
+    ).toBeInTheDocument();
+
+    rerender(
+      <SponsorItemDialog
+        entity={{ ...BASE_ENTITY, id: 42 }}
+        onSave={onSave}
+        onClose={onClose}
+      />
+    );
+    expect(
+      screen.getByText("edit_inventory_item.edit_item")
+    ).toBeInTheDocument();
+  });
+
+  it("blocks save when code/name are empty", async () => {
+    const user = userEvent.setup();
+    render(
+      <SponsorItemDialog
+        entity={BASE_ENTITY}
+        onSave={onSave}
+        onClose={onClose}
+      />
+    );
+
+    await submit(user);
+
+    expect(onSave).not.toHaveBeenCalled();
+  });
+
+  describe("default_quantity requirement", () => {
+    it("is optional by default: saves with no value and shows no required marker", async () => {
+      const user = userEvent.setup();
+      render(
+        <SponsorItemDialog
+          entity={BASE_ENTITY}
+          onSave={onSave}
+          onClose={onClose}
+        />
+      );
+
+      expect(
+        screen.queryByText("edit_inventory_item.default_quantity *")
+      ).not.toBeInTheDocument();
+
+      await fillRequiredTextFields(user);
+      await submit(user);
+
+      await waitFor(() => expect(onSave).toHaveBeenCalledTimes(1));
+      expect(onClose).toHaveBeenCalledTimes(1);
+    });
+
+    it("blocks save, shows the error and the required marker when required and empty", async () => {
+      const user = userEvent.setup();
+      render(
+        <SponsorItemDialog
+          entity={{ ...BASE_ENTITY, default_quantity: undefined }}
+          onSave={onSave}
+          onClose={onClose}
+          requireDefaultQuantity
+        />
+      );
+
+      expect(
+        screen.getByText("edit_inventory_item.default_quantity *")
+      ).toBeInTheDocument();
+
+      await fillRequiredTextFields(user);
+      await submit(user);
+
+      expect(onSave).not.toHaveBeenCalled();
+      expect(
+        await screen.findByText("validation.required")
+      ).toBeInTheDocument();
+    });
+
+    it("allows save once a value is provided when required", async () => {
+      const user = userEvent.setup();
+      render(
+        <SponsorItemDialog
+          entity={{ ...BASE_ENTITY, default_quantity: "" }}
+          onSave={onSave}
+          onClose={onClose}
+          requireDefaultQuantity
+        />
+      );
+
+      await fillRequiredTextFields(user);
+      await user.type(
+        document.querySelector("input[name=\"default_quantity\"]"),
+        "5"
+      );
+      await submit(user);
+
+      await waitFor(() => expect(onSave).toHaveBeenCalledTimes(1));
+      expect(onSave.mock.calls[0][0]).toEqual(
+        expect.objectContaining({ default_quantity: 5 })
+      );
+    });
+  });
+
+  describe("image deletion", () => {
+    it("calls onImageDeleted only for a persisted image (has an id)", async () => {
+      const user = userEvent.setup();
+      const onImageDeleted = jest.fn();
+      render(
+        <SponsorItemDialog
+          entity={{ ...BASE_ENTITY, id: 42 }}
+          onSave={onSave}
+          onClose={onClose}
+          onImageDeleted={onImageDeleted}
+        />
+      );
+
+      await user.click(screen.getByText("delete-unsaved-image"));
+      expect(onImageDeleted).not.toHaveBeenCalled();
+
+      await user.click(screen.getByText("delete-persisted-image"));
+      expect(onImageDeleted).toHaveBeenCalledWith(5);
+      expect(onImageDeleted).toHaveBeenCalledTimes(1);
+    });
+
+    it("does nothing when onImageDeleted is not provided", async () => {
+      const user = userEvent.setup();
+      render(
+        <SponsorItemDialog
+          entity={{ ...BASE_ENTITY, id: 42 }}
+          onSave={onSave}
+          onClose={onClose}
+        />
+      );
+
+      await expect(
+        user.click(screen.getByText("delete-persisted-image"))
+      ).resolves.not.toThrow();
+    });
+  });
+
+  describe("save guard", () => {
+    const renderPending = (save) =>
+      render(
+        <SponsorItemDialog
+          entity={BASE_ENTITY}
+          onSave={save}
+          onClose={onClose}
+        />
+      );
+
+    it("disables the save and close buttons while a save is in flight, and closes on success", async () => {
+      const user = userEvent.setup();
+      let resolveSave;
+      const pendingSave = jest.fn(
+        () =>
+          new Promise((resolve) => {
+            resolveSave = resolve;
+          })
+      );
+      renderPending(pendingSave);
+
+      await fillRequiredTextFields(user);
+      const saveButton = screen.getByRole("button", {
+        name: "edit_inventory_item.save_changes"
+      });
+      await user.click(saveButton);
+
+      await waitFor(() => expect(saveButton).toBeDisabled());
+      expect(screen.getByTestId("CloseIcon").closest("button")).toBeDisabled();
+
+      resolveSave();
+
+      await waitFor(() => expect(onClose).toHaveBeenCalledTimes(1));
+      expect(pendingSave).toHaveBeenCalledTimes(1);
+    });
+
+    it("does not call onSave twice when the save button is double-clicked before isSaving commits", async () => {
+      let resolveSave;
+      const pendingSave = jest.fn(
+        () =>
+          new Promise((resolve) => {
+            resolveSave = resolve;
+          })
+      );
+      renderPending(pendingSave);
+
+      fireEvent.change(document.querySelector("input[name=\"code\"]"), {
+        target: { value: "CODE-1" }
+      });
+      fireEvent.change(document.querySelector("input[name=\"name\"]"), {
+        target: { value: "Item 1" }
+      });
+
+      const saveButton = screen.getByRole("button", {
+        name: "edit_inventory_item.save_changes"
+      });
+
+      // Fired back-to-back with no await in between, so both clicks reach
+      // formik's validation before React commits the isSaving state update
+      // that disables the button - this is the actual race `if (isSaving)
+      // return` in handleOnSave guards against (validation is async, so a
+      // real fast double-click can land before the first render commits).
+      fireEvent.click(saveButton);
+      fireEvent.click(saveButton);
+
+      await waitFor(() => expect(pendingSave).toHaveBeenCalled());
+      resolveSave();
+
+      await waitFor(() => expect(onClose).toHaveBeenCalledTimes(1));
+      expect(pendingSave).toHaveBeenCalledTimes(1);
+    });
+
+    it("keeps the dialog open and re-enables the form when onSave rejects", async () => {
+      const user = userEvent.setup();
+      const rejectingSave = jest.fn(() =>
+        Promise.reject(new Error("save failed"))
+      );
+      renderPending(rejectingSave);
+
+      await fillRequiredTextFields(user);
+      const saveButton = screen.getByRole("button", {
+        name: "edit_inventory_item.save_changes"
+      });
+      await user.click(saveButton);
+
+      await waitFor(() => expect(rejectingSave).toHaveBeenCalled());
+      await waitFor(() => expect(saveButton).not.toBeDisabled());
+      expect(onClose).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/pages/sponsors-global/form-templates/sponsor-inventory-popup.js b/src/pages/sponsors-global/form-templates/sponsor-inventory-popup.js
index 2fadffba1..ad8d2944a 100644
--- a/src/pages/sponsors-global/form-templates/sponsor-inventory-popup.js
+++ b/src/pages/sponsors-global/form-templates/sponsor-inventory-popup.js
@@ -44,7 +44,8 @@ const SponsorItemDialog = ({
   onMetaFieldTypeDeleted,
   onMetaFieldTypeValueDeleted,
   onImageDeleted,
-  entity: initialEntity
+  entity: initialEntity,
+  requireDefaultQuantity = false
 }) => {
   const [isSaving, setIsSaving] = useState(false);
 
@@ -63,7 +64,11 @@ const SponsorItemDialog = ({
       early_bird_rate: nullableDecimalValidation(),
       standard_rate: nullableDecimalValidation(),
       onsite_rate: nullableDecimalValidation(),
-      default_quantity: positiveNumberValidation(),
+      default_quantity: requireDefaultQuantity
+        ? positiveNumberValidation().required(
+            T.translate("validation.required")
+          )
+        : positiveNumberValidation(),
       quantity_limit_per_sponsor: positiveNumberValidation(),
       quantity_limit_per_show: positiveNumberValidation(),
       meta_fields: formMetafieldsValidation()
@@ -178,6 +183,7 @@ const SponsorItemDialog = ({
               <Grid2 size={4}>
                 <InputLabel htmlFor="default_quantity">
                   {T.translate("edit_inventory_item.default_quantity")}
+                  {requireDefaultQuantity && " *"}
                 </InputLabel>
                 <MuiFormikQuantityField
                   variant="outlined"
@@ -270,7 +276,8 @@ SponsorItemDialog.propTypes = {
   onMetaFieldTypeDeleted: PropTypes.func,
   onMetaFieldTypeValueDeleted: PropTypes.func,
   onImageDeleted: PropTypes.func,
-  entity: PropTypes.object
+  entity: PropTypes.object,
+  requireDefaultQuantity: PropTypes.bool
 };
 
 export default SponsorItemDialog;
diff --git a/src/pages/sponsors/sponsor-form-item-list-page/__tests__/sponsor-form-item-list-page.test.js b/src/pages/sponsors/sponsor-form-item-list-page/__tests__/sponsor-form-item-list-page.test.js
index 0916fc17c..883dfa9a4 100644
--- a/src/pages/sponsors/sponsor-form-item-list-page/__tests__/sponsor-form-item-list-page.test.js
+++ b/src/pages/sponsors/sponsor-form-item-list-page/__tests__/sponsor-form-item-list-page.test.js
@@ -30,11 +30,11 @@ jest.mock(
 );
 
 jest.mock(
-  "../components/sponsor-form-item-popup",
+  "../../../sponsors-global/form-templates/sponsor-inventory-popup",
   () =>
-    function MockSponsorFormItemPopup({ onRemoveImage }) {
+    function MockSponsorInventoryDialog({ onImageDeleted }) {
       return (
-        <button onClick={() => onRemoveImage(999)}>
+        <button onClick={() => onImageDeleted(999)}>
           mock-remove-item-image
         </button>
       );
diff --git a/src/pages/sponsors/sponsor-form-item-list-page/components/sponsor-form-item-form.js b/src/pages/sponsors/sponsor-form-item-list-page/components/sponsor-form-item-form.js
deleted file mode 100644
index 9e80401a5..000000000
--- a/src/pages/sponsors/sponsor-form-item-list-page/components/sponsor-form-item-form.js
+++ /dev/null
@@ -1,176 +0,0 @@
-import React from "react";
-import {
-  Box,
-  Button,
-  DialogActions,
-  DialogContent,
-  Divider,
-  FormLabel,
-  Grid2,
-  InputLabel,
-  Typography
-} from "@mui/material";
-import T from "i18n-react";
-import * as yup from "yup";
-import { FormikProvider, useFormik } from "formik";
-import MuiFormikUpload from "openstack-uicore-foundation/lib/components/mui/formik-inputs/upload";
-import AdditionalInputList from "openstack-uicore-foundation/lib/components/mui/formik-inputs/additional-input-list";
-import MuiFormikTextField from "openstack-uicore-foundation/lib/components/mui/formik-inputs/textfield";
-import MuiFormikQuantityField from "openstack-uicore-foundation/lib/components/mui/formik-inputs/quantity-field";
-import {
-  addIssAfterDateFieldValidator,
-  nullableDecimalValidation,
-  formMetafieldsValidation,
-  positiveNumberValidation,
-  requiredStringValidation
-} from "../../../../utils/yup";
-import useScrollToError from "../../../../hooks/useScrollToError";
-import ItemPriceTiers from "../../../../components/mui/formik-inputs/item-price-tiers";
-import FormikTextEditor from "../../../../components/inputs/formik-text-editor";
-import { MAX_INVENTORY_IMAGES_UPLOAD_QTY } from "../../../../utils/constants";
-import { getFileUploadAllowedExtensions } from "../../../../utils/methods";
-
-const buildInitialValues = (data) => ({ ...data });
-
-addIssAfterDateFieldValidator();
-
-const SponsorFormItemForm = ({ initialValues, onSubmit, isSaving, onImageDeleted }) => {
-  const formik = useFormik({
-    initialValues: buildInitialValues(initialValues),
-    validationSchema: yup.object({
-      code: requiredStringValidation(),
-      name: requiredStringValidation(),
-      early_bird_rate: nullableDecimalValidation(),
-      standard_rate: nullableDecimalValidation(),
-      onsite_rate: nullableDecimalValidation(),
-      default_quantity: positiveNumberValidation().required(
-        T.translate("validation.required")
-      ),
-      quantity_limit_per_sponsor: positiveNumberValidation(),
-      quantity_limit_per_show: positiveNumberValidation(),
-      meta_fields: formMetafieldsValidation()
-    }),
-    onSubmit,
-    enableReinitialize: true
-  });
-
-  // SCROLL TO ERROR
-  useScrollToError(formik);
-
-  const handleDeleteImage = (id) => {
-    if (id && onImageDeleted) onImageDeleted(id);
-  };
-
-  return (
-    <FormikProvider value={formik}>
-      <Box
-        component="form"
-        onSubmit={formik.handleSubmit}
-        noValidate
-        autoComplete="off"
-      >
-        <DialogContent sx={{ p: 0 }}>
-          <Grid2 container spacing={2} size={12} sx={{ p: 3 }}>
-            <Grid2 size={4}>
-              <MuiFormikTextField
-                name="code"
-                label={T.translate("sponsor_form_item_list.edit_item.code")}
-                fullWidth
-                required
-              />
-            </Grid2>
-            <Grid2 size={8}>
-              <MuiFormikTextField
-                name="name"
-                label={T.translate("sponsor_form_item_list.edit_item.name")}
-                fullWidth
-                required
-              />
-            </Grid2>
-            <Grid2 size={12}>
-              <InputLabel htmlFor="description">
-                {T.translate("sponsor_form_item_list.edit_item.description")}
-              </InputLabel>
-              <FormikTextEditor
-                name="description"
-                options={{ zIndex: 9999999 }}
-              />
-            </Grid2>
-            <ItemPriceTiers />
-            <Grid2 size={4}>
-              <MuiFormikQuantityField
-                name="quantity_limit_per_show"
-                label={T.translate(
-                  "sponsor_form_item_list.edit_item.quantity_limit_per_show"
-                )}
-                fullWidth
-                type="number"
-                inputProps={{ min: 0 }}
-              />
-            </Grid2>
-            <Grid2 size={4}>
-              <MuiFormikQuantityField
-                name="quantity_limit_per_sponsor"
-                label={T.translate(
-                  "sponsor_form_item_list.edit_item.quantity_limit_per_sponsor"
-                )}
-                fullWidth
-                type="number"
-                inputProps={{ min: 0 }}
-              />
-            </Grid2>
-            <Grid2 size={4}>
-              <MuiFormikQuantityField
-                name="default_quantity"
-                label={T.translate(
-                  "sponsor_form_item_list.edit_item.default_quantity"
-                )}
-                fullWidth
-                type="number"
-                inputProps={{ min: 0 }}
-                required
-              />
-            </Grid2>
-          </Grid2>
-          <Grid2 size={12}>
-            <Box sx={{ px: 3, my: "10px" }}>
-              <Typography variant="h5">
-                {T.translate(
-                  "sponsor_form_item_list.edit_item.additional_fields"
-                )}
-              </Typography>
-              <AdditionalInputList name="meta_fields" />
-            </Box>
-          </Grid2>
-          <Grid2 size={12}>
-            <Box sx={{ px: 3, my: "10px" }}>
-              <FormLabel>
-                {T.translate("sponsor_form_item_list.edit_item.images")}
-              </FormLabel>
-              <MuiFormikUpload
-                id="item-image-upload"
-                name="images"
-                maxFiles={MAX_INVENTORY_IMAGES_UPLOAD_QTY}
-                onDelete={handleDeleteImage}
-                allowedExtensions={getFileUploadAllowedExtensions()}
-              />
-            </Box>
-          </Grid2>
-        </DialogContent>
-        <Divider />
-        <DialogActions>
-          <Button
-            type="submit"
-            fullWidth
-            variant="contained"
-            disabled={isSaving}
-          >
-            {T.translate("sponsor_form_item_list.edit_item.save")}
-          </Button>
-        </DialogActions>
-      </Box>
-    </FormikProvider>
-  );
-};
-
-export default SponsorFormItemForm;
diff --git a/src/pages/sponsors/sponsor-form-item-list-page/components/sponsor-form-item-popup.js b/src/pages/sponsors/sponsor-form-item-list-page/components/sponsor-form-item-popup.js
deleted file mode 100644
index 4d2be9764..000000000
--- a/src/pages/sponsors/sponsor-form-item-list-page/components/sponsor-form-item-popup.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React, { useState } from "react";
-import PropTypes from "prop-types";
-import T from "i18n-react/dist/i18n-react";
-import {
-  Dialog,
-  DialogTitle,
-  Divider,
-  IconButton,
-  Typography
-} from "@mui/material";
-import CloseIcon from "@mui/icons-material/Close";
-import SponsorFormItemForm from "./sponsor-form-item-form";
-
-const SponsorFormItemPopup = ({ item, onClose, onSave, onRemoveImage }) => {
-  const [isSaving, setIsSaving] = useState(false);
-
-  const handleClose = () => {
-    if (isSaving) return;
-    onClose();
-  };
-
-  const handleOnSave = (values) => {
-    if (isSaving) return;
-    setIsSaving(true);
-    onSave(values)
-      .then(() => onClose())
-      .catch(() => { })
-      .finally(() => setIsSaving(false));
-  };
-
-  const handleRemoveImage = (imageId) => {
-    onRemoveImage(imageId);
-  };
-
-  return (
-    <Dialog
-      open
-      onClose={handleClose}
-      maxWidth="md"
-      fullWidth
-      disableEscapeKeyDown={isSaving}
-    >
-      <DialogTitle
-        sx={{ display: "flex", justifyContent: "space-between" }}
-        component="div"
-      >
-        <Typography variant="h5">
-          {T.translate(
-            `sponsor_form_item_list.edit_item.${item?.id ? "edit" : "new"}`
-          )}
-        </Typography>
-        <IconButton
-          size="large"
-          sx={{ p: 0 }}
-          onClick={handleClose}
-          disabled={isSaving}
-        >
-          <CloseIcon fontSize="large" />
-        </IconButton>
-      </DialogTitle>
-      <Divider />
-      <SponsorFormItemForm
-        initialValues={item}
-        onSubmit={handleOnSave}
-        isSaving={isSaving}
-        onImageDeleted={handleRemoveImage}
-      />
-    </Dialog>
-  );
-};
-
-SponsorFormItemPopup.propTypes = {
-  onClose: PropTypes.func.isRequired,
-  onSave: PropTypes.func.isRequired,
-  onRemoveImage: PropTypes.func.isRequired,
-  item: PropTypes.object
-};
-
-export default SponsorFormItemPopup;
diff --git a/src/pages/sponsors/sponsor-form-item-list-page/index.js b/src/pages/sponsors/sponsor-form-item-list-page/index.js
index 87721eef9..b5cc9f3b4 100644
--- a/src/pages/sponsors/sponsor-form-item-list-page/index.js
+++ b/src/pages/sponsors/sponsor-form-item-list-page/index.js
@@ -40,7 +40,7 @@ import {
   removeItemFile
 } from "../../../actions/sponsor-forms-actions";
 import { getInventoryItems } from "../../../actions/inventory-item-actions";
-import SponsorFormItemPopup from "./components/sponsor-form-item-popup";
+import SponsorInventoryDialog from "../../sponsors-global/form-templates/sponsor-inventory-popup";
 import SponsorFormAddItemFromInventoryPopup from "./components/sponsor-form-add-item-from-inventory-popup";
 import { DEFAULT_CURRENT_PAGE } from "../../../utils/constants";
 import { rateCellValidation } from "../../../utils/yup";
@@ -364,11 +364,12 @@ const SponsorFormItemListPage = ({
         </div>
       )}
       {openPopup === "crud" && (
-        <SponsorFormItemPopup
-          item={currentItem}
+        <SponsorInventoryDialog
+          entity={currentItem}
           onSave={handleSaveItem}
           onClose={handleClosePopup}
-          onRemoveImage={handleRemoveItemImage}
+          onImageDeleted={handleRemoveItemImage}
+          requireDefaultQuantity
         />
       )}
       {openPopup === "inventory" && (