diff --git a/src/actions/page-template-actions.js b/src/actions/page-template-actions.js
index 3f1d455d0..f719b79a2 100644
--- a/src/actions/page-template-actions.js
+++ b/src/actions/page-template-actions.js
@@ -175,10 +175,9 @@ export const savePageTemplate = (entity) => async (dispatch) => {
             html: T.translate("page_template_list.page_crud.page_saved")
           })
         );
-        getPageTemplates()(dispatch);
       })
       .catch((err) => {
-        console.error(err);
+        throw err;
       })
       .finally(() => {
         dispatch(stopLoading());
@@ -200,10 +199,9 @@ export const savePageTemplate = (entity) => async (dispatch) => {
           html: T.translate("page_template_list.page_crud.page_created")
         })
       );
-      getPageTemplates()(dispatch);
     })
     .catch((err) => {
-      console.error(err);
+      throw err;
     })
     .finally(() => {
       dispatch(stopLoading());
diff --git a/src/pages/sponsors-global/page-templates/page-template-list-page.js b/src/pages/sponsors-global/page-templates/page-template-list-page.js
index 0b4b05d21..b19a3e416 100644
--- a/src/pages/sponsors-global/page-templates/page-template-list-page.js
+++ b/src/pages/sponsors-global/page-templates/page-template-list-page.js
@@ -114,9 +114,17 @@ const PageTemplateListPage = ({
     setOpenCloneDialog(true);
   };
 
-  const handleSavePageTemplate = (entity) => {
-    savePageTemplate(entity).then(() => setOpenPageDialog(false));
-  };
+  const handleSavePageTemplate = (entity) =>
+    savePageTemplate(entity).then(() => {
+      getPageTemplates(
+        term,
+        DEFAULT_CURRENT_PAGE,
+        perPage,
+        order,
+        orderDir,
+        showArchived
+      ).catch(() => {});
+    });
 
   const handleArchive = (item) =>
     item.is_archived
@@ -285,6 +293,7 @@ const PageTemplateListPage = ({
           pageTemplate={pageTemplate}
           onClose={handleClosePageDialog}
           onSave={handleSavePageTemplate}
+          isGlobal
         />
       )}
       {openCloneDialog && (
diff --git a/src/pages/sponsors-global/page-templates/page-template-popup/page-template-module-form.test.js b/src/pages/sponsors-global/page-templates/page-template-popup/__tests__/page-template-module-form.test.js
similarity index 90%
rename from src/pages/sponsors-global/page-templates/page-template-popup/page-template-module-form.test.js
rename to src/pages/sponsors-global/page-templates/page-template-popup/__tests__/page-template-module-form.test.js
index ab792f581..8a8604bcc 100644
--- a/src/pages/sponsors-global/page-templates/page-template-popup/page-template-module-form.test.js
+++ b/src/pages/sponsors-global/page-templates/page-template-popup/__tests__/page-template-module-form.test.js
@@ -6,23 +6,26 @@ import { Provider } from "react-redux";
 import configureStore from "redux-mock-store";
 import thunk from "redux-thunk";
 import "@testing-library/jest-dom";
-import PageModules from "./page-template-modules-form";
-import showConfirmDialog from "../../../../components/mui/showConfirmDialog";
+import showConfirmDialog from "openstack-uicore-foundation/lib/components/mui/show-confirm-dialog";
+import PageModules from "../page-template-modules-form";
 import {
   PAGES_MODULE_KINDS,
   PAGE_MODULES_MEDIA_TYPES
-} from "../../../../utils/constants";
+} from "../../../../../utils/constants";
 
 const mockStore = configureStore([thunk]);
 
 // Mocks
-jest.mock("../../../../components/mui/showConfirmDialog", () => jest.fn());
-jest.mock("../../../../actions/media-file-type-actions", () => ({
+jest.mock(
+  "openstack-uicore-foundation/lib/components/mui/show-confirm-dialog",
+  () => jest.fn()
+);
+jest.mock("../../../../../actions/media-file-type-actions", () => ({
   getAllMediaFileTypes: jest.fn(() => () => Promise.resolve())
 }));
 
 jest.mock(
-  "../../../../components/inputs/formik-text-editor",
+  "openstack-uicore-foundation/lib/components/mui/formik-inputs/texteditor",
   () =>
     function MockFormikTextEditor({ name }) {
       return <textarea data-testid={`text-editor-${name}`} />;
@@ -38,7 +41,7 @@ jest.mock(
 );
 
 jest.mock(
-  "../../../../components/mui/formik-inputs/mui-formik-textfield",
+  "openstack-uicore-foundation/lib/components/mui/formik-inputs/textfield",
   () =>
     function MockMuiFormikTextField({ name }) {
       return <input data-testid={`textfield-${name}`} />;
@@ -46,7 +49,7 @@ jest.mock(
 );
 
 jest.mock(
-  "../../../../components/mui/formik-inputs/mui-formik-select",
+  "openstack-uicore-foundation/lib/components/mui/formik-inputs/select",
   () =>
     function MockMuiFormikSelect({ name, children }) {
       return <select data-testid={`select-${name}`}>{children}</select>;
@@ -62,25 +65,17 @@ jest.mock(
 );
 
 jest.mock(
-  "../../../../components/mui/formik-inputs/mui-formik-radio-group",
+  "openstack-uicore-foundation/lib/components/mui/formik-inputs/radio-group",
   () =>
     function MockMuiFormikRadioGroup({ name }) {
       return <div data-testid={`radio-group-${name}`} />;
     }
 );
 
-jest.mock(
-  "../../../../components/mui/formik-inputs/mui-formik-async-select",
-  () =>
-    function MockMuiFormikAsyncSelect({ name }) {
-      return <select data-testid={`async-select-${name}`} />;
-    }
-);
-
 // Mock DragAndDropList to capture onReorder
 let capturedOnReorder = null;
 jest.mock(
-  "../../../../components/mui/dnd-list",
+  "openstack-uicore-foundation/lib/components/mui/dnd-list",
   () =>
     function MockDragAndDropList({ items, renderItem, onReorder }) {
       capturedOnReorder = onReorder;
@@ -97,7 +92,10 @@ jest.mock(
 );
 
 // Helper function to render the component with Formik and Redux
-const renderWithFormik = (initialValues = { modules: [] }) => {
+const renderWithFormik = (
+  initialValues = { modules: [] },
+  isGlobal = false
+) => {
   const store = mockStore({
     mediaUploadState: {
       media_file_types: []
@@ -107,7 +105,7 @@ const renderWithFormik = (initialValues = { modules: [] }) => {
     <Provider store={store}>
       <Formik initialValues={initialValues} onSubmit={jest.fn()}>
         <Form>
-          <PageModules name="modules" />
+          <PageModules name="modules" isGlobal={isGlobal} />
         </Form>
       </Formik>
     </Provider>
@@ -173,6 +171,26 @@ describe("PageModules", () => {
     });
   });
 
+  describe("isGlobal", () => {
+    test("shows the upload deadline datepicker for a MEDIA module when isGlobal is false", () => {
+      const modules = [createModule(PAGES_MODULE_KINDS.MEDIA, 0, 1)];
+      renderWithFormik({ modules }, false);
+
+      expect(
+        screen.getByTestId("datepicker-modules[0].upload_deadline")
+      ).toBeInTheDocument();
+    });
+
+    test("hides the upload deadline datepicker for a MEDIA module when isGlobal is true", () => {
+      const modules = [createModule(PAGES_MODULE_KINDS.MEDIA, 0, 1)];
+      renderWithFormik({ modules }, true);
+
+      expect(
+        screen.queryByTestId("datepicker-modules[0].upload_deadline")
+      ).not.toBeInTheDocument();
+    });
+  });
+
   describe("Module ordering", () => {
     test("renders modules in the order they appear in the array", () => {
       const modules = [
diff --git a/src/pages/sponsors-global/page-templates/page-template-popup/__tests__/page-template-popup.test.js b/src/pages/sponsors-global/page-templates/page-template-popup/__tests__/page-template-popup.test.js
new file mode 100644
index 000000000..dd62bb070
--- /dev/null
+++ b/src/pages/sponsors-global/page-templates/page-template-popup/__tests__/page-template-popup.test.js
@@ -0,0 +1,247 @@
+import React from "react";
+import { render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { Provider } from "react-redux";
+import configureStore from "redux-mock-store";
+import thunk from "redux-thunk";
+import { yupToFormErrors } from "formik";
+import "@testing-library/jest-dom";
+import PageTemplatePopup from "../index";
+import {
+  PAGES_MODULE_KINDS,
+  PAGE_MODULES_MEDIA_TYPES
+} from "../../../../../utils/constants";
+
+const mockStore = configureStore([thunk]);
+
+jest.mock("i18n-react/dist/i18n-react", () => ({
+  __esModule: true,
+  default: { translate: (key) => key }
+}));
+
+jest.mock("formik", () => {
+  const actual = jest.requireActual("formik");
+  return {
+    __esModule: true,
+    ...actual,
+    yupToFormErrors: jest.fn(actual.yupToFormErrors)
+  };
+});
+
+jest.mock("../../../../../actions/media-file-type-actions", () => ({
+  getAllMediaFileTypes: jest.fn(() => () => Promise.resolve())
+}));
+
+jest.mock("../../../../../actions/sponsor-actions", () => ({
+  querySponsorAddons: jest.fn()
+}));
+
+jest.mock(
+  "openstack-uicore-foundation/lib/components/mui/formik-inputs/datepicker",
+  () =>
+    function MockMuiFormikDatepicker({ name }) {
+      return <input data-testid={`datepicker-${name}`} type="date" />;
+    }
+);
+
+jest.mock(
+  "openstack-uicore-foundation/lib/components/mui/formik-inputs/textfield",
+  () =>
+    function MockMuiFormikTextField({ name }) {
+      return <input data-testid={`textfield-${name}`} />;
+    }
+);
+
+jest.mock(
+  "openstack-uicore-foundation/lib/components/mui/formik-inputs/select-group",
+  () =>
+    function MockMuiFormikRadioGroup({ name }) {
+      return <div data-testid={`radio-group-${name}`} />;
+    }
+);
+
+const baseMediaModule = {
+  _tempId: "temp-1",
+  kind: PAGES_MODULE_KINDS.MEDIA,
+  type: PAGE_MODULES_MEDIA_TYPES.INPUT,
+  name: "Resume",
+  description: "Upload your resume",
+  upload_deadline: null
+};
+
+const renderPopup = ({
+  isGlobal,
+  onSave,
+  modules = [baseMediaModule]
+} = {}) => {
+  const store = mockStore({ mediaUploadState: { media_file_types: [] } });
+  return render(
+    <Provider store={store}>
+      <PageTemplatePopup
+        pageTemplate={{ code: "TPL1", name: "Template 1", modules }}
+        onClose={jest.fn()}
+        onSave={onSave}
+        isGlobal={isGlobal}
+      />
+    </Provider>
+  );
+};
+
+describe("PageTemplatePopup — upload_deadline requiredness", () => {
+  it("blocks submit when upload_deadline is missing and isGlobal is false", async () => {
+    const onSave = jest.fn();
+    renderPopup({ isGlobal: false, onSave });
+
+    await userEvent.click(
+      screen.getByRole("button", { name: "page_template_list.page_crud.save" })
+    );
+
+    await waitFor(() => {
+      expect(onSave).not.toHaveBeenCalled();
+    });
+  });
+
+  it("allows submit when upload_deadline is missing and isGlobal is true", async () => {
+    const onSave = jest.fn(() => Promise.resolve());
+    renderPopup({ isGlobal: true, onSave });
+
+    await userEvent.click(
+      screen.getByRole("button", { name: "page_template_list.page_crud.save" })
+    );
+
+    await waitFor(() => {
+      expect(onSave).toHaveBeenCalled();
+    });
+  });
+
+  it("clears a stale upload_deadline carried over from a legacy module when isGlobal is true", async () => {
+    const onSave = jest.fn(() => Promise.resolve());
+    const legacyModule = {
+      ...baseMediaModule,
+      upload_deadline: 1700000000
+    };
+    renderPopup({ isGlobal: true, onSave, modules: [legacyModule] });
+
+    await userEvent.click(
+      screen.getByRole("button", { name: "page_template_list.page_crud.save" })
+    );
+
+    await waitFor(() => {
+      expect(onSave).toHaveBeenCalled();
+    });
+    expect(onSave.mock.calls[0][0].modules[0].upload_deadline).toBeNull();
+  });
+});
+
+describe("PageTemplatePopup validation — empty-string normalization", () => {
+  it("reports the standard required message (not a Yup cast error) when max_file_size is cleared to an empty string", async () => {
+    const module = {
+      _tempId: "temp-1",
+      kind: PAGES_MODULE_KINDS.MEDIA,
+      type: PAGE_MODULES_MEDIA_TYPES.FILE,
+      name: "Doc",
+      description: "Desc",
+      upload_deadline: 1700000000,
+      max_file_size: "",
+      file_type_id: 1
+    };
+    renderPopup({ isGlobal: false, onSave: jest.fn(), modules: [module] });
+
+    await userEvent.click(
+      screen.getByRole("button", { name: "page_template_list.page_crud.save" })
+    );
+
+    await waitFor(() => {
+      expect(yupToFormErrors).toHaveBeenCalled();
+    });
+    const errors = yupToFormErrors.mock.results.at(-1).value;
+    expect(errors.modules[0].max_file_size).toBe("validation.required");
+  });
+});
+
+describe("PageTemplatePopup — isSaving guard", () => {
+  const renderSavingPopup = ({ onClose, onSave }) => {
+    const store = mockStore({ mediaUploadState: { media_file_types: [] } });
+    return render(
+      <Provider store={store}>
+        <PageTemplatePopup
+          pageTemplate={{ code: "TPL1", name: "Template 1", modules: [] }}
+          onClose={onClose}
+          onSave={onSave}
+          isGlobal
+        />
+      </Provider>
+    );
+  };
+
+  it("disables the submit and close buttons while a save is in flight, and closes on success", async () => {
+    let resolveSave;
+    const onSave = jest.fn(
+      () =>
+        new Promise((resolve) => {
+          resolveSave = resolve;
+        })
+    );
+    const onClose = jest.fn();
+    renderSavingPopup({ onClose, onSave });
+
+    const saveButton = screen.getByRole("button", {
+      name: "page_template_list.page_crud.save"
+    });
+    await userEvent.click(saveButton);
+
+    await waitFor(() => {
+      expect(saveButton).toBeDisabled();
+    });
+    expect(screen.getByTestId("CloseIcon").closest("button")).toBeDisabled();
+
+    resolveSave();
+
+    await waitFor(() => {
+      expect(onClose).toHaveBeenCalled();
+    });
+  });
+
+  it("ignores a second click while saving (no double submit)", async () => {
+    let resolveSave;
+    const onSave = jest.fn(
+      () =>
+        new Promise((resolve) => {
+          resolveSave = resolve;
+        })
+    );
+    renderSavingPopup({ onClose: jest.fn(), onSave });
+
+    const saveButton = screen.getByRole("button", {
+      name: "page_template_list.page_crud.save"
+    });
+    await userEvent.click(saveButton);
+    await waitFor(() => {
+      expect(saveButton).toBeDisabled();
+    });
+
+    resolveSave();
+    await waitFor(() => {
+      expect(onSave).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  it("keeps the dialog open and re-enables the form when onSave rejects", async () => {
+    const onSave = jest.fn(() => Promise.reject(new Error("save failed")));
+    const onClose = jest.fn();
+    renderSavingPopup({ onClose, onSave });
+
+    const saveButton = screen.getByRole("button", {
+      name: "page_template_list.page_crud.save"
+    });
+    await userEvent.click(saveButton);
+
+    await waitFor(() => {
+      expect(onSave).toHaveBeenCalled();
+    });
+    await waitFor(() => {
+      expect(saveButton).not.toBeDisabled();
+    });
+    expect(onClose).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/pages/sponsors-global/page-templates/page-template-popup/index.js b/src/pages/sponsors-global/page-templates/page-template-popup/index.js
index 91a7b2068..cb19f223a 100644
--- a/src/pages/sponsors-global/page-templates/page-template-popup/index.js
+++ b/src/pages/sponsors-global/page-templates/page-template-popup/index.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import T from "i18n-react/dist/i18n-react";
 import PropTypes from "prop-types";
 import {
@@ -17,10 +17,16 @@ import {
 } from "@mui/material";
 import AddIcon from "@mui/icons-material/Add";
 import CloseIcon from "@mui/icons-material/Close";
-import { FormikProvider, useFormik } from "formik";
+import {
+  FormikProvider,
+  prepareDataForValidation,
+  useFormik,
+  yupToFormErrors
+} from "formik";
 import * as yup from "yup";
 import MuiDropdownCheckbox from "openstack-uicore-foundation/lib/components/mui/dropdown-checkbox";
-import MuiFormikTextField from "../../../../components/mui/formik-inputs/mui-formik-textfield";
+import MuiFormikTextField from "openstack-uicore-foundation/lib/components/mui/formik-inputs/textfield";
+import MuiFormikSelectGroup from "openstack-uicore-foundation/lib/components/mui/formik-inputs/select-group";
 import PageModules from "./page-template-modules-form";
 import {
   BYTES_PER_MB,
@@ -30,9 +36,76 @@ import {
   PAGE_MODULES_MEDIA_TYPES,
   PAGE_MODULES_DOWNLOAD
 } from "../../../../utils/constants";
-import MuiFormikSelectGroup from "../../../../components/mui/formik-inputs/mui-formik-select-group";
 import { querySponsorAddons } from "../../../../actions/sponsor-actions";
 
+const infoModuleSchema = yup.object().shape({
+  kind: yup.string().equals([PAGES_MODULE_KINDS.INFO]),
+  content: yup.string().required(T.translate("validation.required"))
+});
+
+const documentModuleSchema = yup.object().shape({
+  kind: yup.string().equals([PAGES_MODULE_KINDS.DOCUMENT]),
+  name: yup.string().required(T.translate("validation.required")),
+  description: yup.string().required(T.translate("validation.required")),
+  external_url: yup.string().when("type", {
+    is: PAGE_MODULES_DOWNLOAD.URL,
+    then: (schema) => schema.required(T.translate("validation.required")),
+    otherwise: (schema) => schema.nullable()
+  }),
+  file: yup.array().when("type", {
+    is: PAGE_MODULES_DOWNLOAD.FILE,
+    then: (schema) =>
+      schema
+        .nullable()
+        .required(T.translate("validation.file_required"))
+        .min(1, T.translate("validation.file_required")),
+    otherwise: (schema) => schema.nullable()
+  })
+});
+
+const mediaModuleSchema = yup.object().shape({
+  kind: yup.string().equals([PAGES_MODULE_KINDS.MEDIA]),
+  name: yup.string().required(T.translate("validation.required")),
+  type: yup.string().required(T.translate("validation.required")),
+  upload_deadline: yup.date().when("$isGlobal", {
+    is: true,
+    then: (s) => s.nullable(),
+    otherwise: (s) => s.required(T.translate("validation.required"))
+  }),
+  description: yup.string().required(T.translate("validation.required")),
+  max_file_size: yup.number().when("type", {
+    is: PAGE_MODULES_MEDIA_TYPES.FILE,
+    then: (schema) =>
+      schema
+        .min(BYTES_PER_MB, T.translate("validation.non_negative"))
+        .required(T.translate("validation.required"))
+        .test(
+          "mib-aligned",
+          T.translate("validation.mib_aligned"),
+          (value) => value == null || value % BYTES_PER_MB === 0
+        ),
+    otherwise: (schema) => schema.nullable()
+  }),
+  file_type_id: yup.number().when("type", {
+    is: PAGE_MODULES_MEDIA_TYPES.FILE,
+    then: (schema) => schema.required(T.translate("validation.required")),
+    otherwise: (schema) => schema.nullable()
+  })
+});
+
+const moduleSchema = yup.lazy((value) => {
+  switch (value?.kind) {
+    case PAGES_MODULE_KINDS.INFO:
+      return infoModuleSchema;
+    case PAGES_MODULE_KINDS.DOCUMENT:
+      return documentModuleSchema;
+    case PAGES_MODULE_KINDS.MEDIA:
+      return mediaModuleSchema;
+    default:
+      return yup.object();
+  }
+});
+
 const PageTemplatePopup = ({
   pageTemplate,
   onClose,
@@ -41,8 +114,10 @@ const PageTemplatePopup = ({
   summitId,
   sponsorId,
   sponsorshipIds,
-  title
+  title,
+  isGlobal
 }) => {
+  const [isSaving, setIsSaving] = useState(false);
   const popupTitle =
     title ??
     (pageTemplate?.id
@@ -51,92 +126,59 @@ const PageTemplatePopup = ({
   const showSponsorships =
     Array.isArray(sponsorships) && sponsorships.length > 0;
 
-  const showAllowedAddons = summitId && sponsorId && sponsorshipIds?.length > 0;
-
-  const infoModuleSchema = yup.object().shape({
-    kind: yup.string().equals([PAGES_MODULE_KINDS.INFO]),
-    content: yup.string().required(T.translate("validation.required"))
-  });
-
-  const documentModuleSchema = yup.object().shape({
-    kind: yup.string().equals([PAGES_MODULE_KINDS.DOCUMENT]),
-    name: yup.string().required(T.translate("validation.required")),
-    description: yup.string().required(T.translate("validation.required")),
-    external_url: yup.string().when("type", {
-      is: PAGE_MODULES_DOWNLOAD.URL,
-      then: (schema) => schema.required(T.translate("validation.required")),
-      otherwise: (schema) => schema.nullable()
-    }),
-    file: yup.array().when("type", {
-      is: PAGE_MODULES_DOWNLOAD.FILE,
-      then: (schema) =>
-        schema
-          .nullable()
-          .required(T.translate("validation.file_required"))
-          .min(1, T.translate("validation.file_required")),
-      otherwise: (schema) => schema.nullable()
-    })
-  });
+  const handleClose = () => {
+    if (isSaving) return;
+    onClose();
+  };
 
-  const mediaModuleSchema = yup.object().shape({
-    kind: yup.string().equals([PAGES_MODULE_KINDS.MEDIA]),
-    name: yup.string().required(T.translate("validation.required")),
-    type: yup.string().required(T.translate("validation.required")),
-    upload_deadline: yup.date().required(T.translate("validation.required")),
-    description: yup.string().required(T.translate("validation.required")),
-    max_file_size: yup.number().when("type", {
-      is: PAGE_MODULES_MEDIA_TYPES.FILE,
-      then: (schema) =>
-        schema
-          .min(BYTES_PER_MB, T.translate("validation.non_negative"))
-          .required(T.translate("validation.required"))
-          .test(
-            "mib-aligned",
-            T.translate("validation.mib_aligned"),
-            (value) => value == null || value % BYTES_PER_MB === 0
-          ),
-      otherwise: (schema) => schema.nullable()
-    }),
-    file_type_id: yup.number().when("type", {
-      is: PAGE_MODULES_MEDIA_TYPES.FILE,
-      then: (schema) => schema.required(T.translate("validation.required")),
-      otherwise: (schema) => schema.nullable()
-    })
-  });
+  const showAllowedAddons = summitId && sponsorId && sponsorshipIds?.length > 0;
 
-  const moduleSchema = yup.lazy((value) => {
-    switch (value?.kind) {
-      case PAGES_MODULE_KINDS.INFO:
-        return infoModuleSchema;
-      case PAGES_MODULE_KINDS.DOCUMENT:
-        return documentModuleSchema;
-      case PAGES_MODULE_KINDS.MEDIA:
-        return mediaModuleSchema;
-      default:
-        return yup.object();
-    }
-  });
+  const validationSchema = React.useMemo(
+    () =>
+      yup.object().shape({
+        code: yup.string().required(T.translate("validation.required")),
+        name: yup.string().required(T.translate("validation.required")),
+        ...(showSponsorships && {
+          sponsorship_types: yup
+            .array()
+            .min(1, T.translate("validation.required"))
+        }),
+        modules: yup.array().of(moduleSchema)
+      }),
+    [showSponsorships]
+  );
 
   const formik = useFormik({
     initialValues: pageTemplate,
-    validationSchema: yup.object().shape({
-      code: yup.string().required(T.translate("validation.required")),
-      name: yup.string().required(T.translate("validation.required")),
-      ...(showSponsorships && {
-        sponsorship_types: yup
-          .array()
-          .min(1, T.translate("validation.required"))
-      }),
-      modules: yup.array().of(moduleSchema)
-    }),
+    validate: (values) => {
+      try {
+        validationSchema.validateSync(prepareDataForValidation(values), {
+          abortEarly: false,
+          context: { isGlobal }
+        });
+        return {};
+      } catch (err) {
+        return yupToFormErrors(err);
+      }
+    },
     enableReinitialize: true,
     onSubmit: (values) => {
+      if (isSaving) return;
+      setIsSaving(true);
+
       const modulesWithOrder = values.modules.map((m, idx) => ({
         ...m,
         custom_order: idx
       }));
 
-      onSave({ ...values, modules: modulesWithOrder });
+      onSave({ ...values, modules: modulesWithOrder })
+        .then(() => {
+          onClose();
+        })
+        .catch(() => {})
+        .finally(() => {
+          setIsSaving(false);
+        });
     }
   });
 
@@ -180,10 +222,21 @@ const PageTemplatePopup = ({
   };
 
   return (
-    <Dialog open onClose={onClose} maxWidth="md" fullWidth>
+    <Dialog
+      open
+      onClose={handleClose}
+      maxWidth="md"
+      fullWidth
+      disableEscapeKeyDown={isSaving}
+    >
       <DialogTitle sx={{ display: "flex", justifyContent: "space-between" }}>
         <Typography fontSize="1.5rem">{popupTitle}</Typography>
-        <IconButton size="small" onClick={onClose} sx={{ mr: 1 }}>
+        <IconButton
+          size="small"
+          onClick={handleClose}
+          disabled={isSaving}
+          sx={{ mr: 1 }}
+        >
           <CloseIcon fontSize="small" />
         </IconButton>
       </DialogTitle>
@@ -301,12 +354,17 @@ const PageTemplatePopup = ({
             </Grid2>
             <Divider sx={{ mb: 2 }} />
             <Box sx={{ py: 2 }}>
-              <PageModules name="modules" />
+              <PageModules name="modules" isGlobal={isGlobal} />
             </Box>
           </DialogContent>
           <Divider />
           <DialogActions>
-            <Button type="submit" fullWidth variant="contained">
+            <Button
+              type="submit"
+              fullWidth
+              variant="contained"
+              disabled={isSaving}
+            >
               {T.translate("page_template_list.page_crud.save")}
             </Button>
           </DialogActions>
@@ -323,7 +381,8 @@ PageTemplatePopup.propTypes = {
   sponsorshipIds: PropTypes.array,
   summitId: PropTypes.number,
   sponsorId: PropTypes.number,
-  title: PropTypes.string
+  title: PropTypes.string,
+  isGlobal: PropTypes.bool
 };
 
 export default PageTemplatePopup;
diff --git a/src/pages/sponsors-global/page-templates/page-template-popup/modules/page-template-document-download-module.js b/src/pages/sponsors-global/page-templates/page-template-popup/modules/page-template-document-download-module.js
index 64945f2be..dde31c3e3 100644
--- a/src/pages/sponsors-global/page-templates/page-template-popup/modules/page-template-document-download-module.js
+++ b/src/pages/sponsors-global/page-templates/page-template-popup/modules/page-template-document-download-module.js
@@ -4,9 +4,9 @@ import T from "i18n-react/dist/i18n-react";
 import { useField } from "formik";
 import { Divider, Grid2, InputLabel } from "@mui/material";
 import MuiFormikUpload from "openstack-uicore-foundation/lib/components/mui/formik-inputs/upload";
-import MuiFormikTextField from "../../../../../components/mui/formik-inputs/mui-formik-textfield";
+import MuiFormikTextField from "openstack-uicore-foundation/lib/components/mui/formik-inputs/textfield";
+import MuiFormikRadioGroup from "openstack-uicore-foundation/lib/components/mui/formik-inputs/radio-group";
 import { PAGE_MODULES_DOWNLOAD } from "../../../../../utils/constants";
-import MuiFormikRadioGroup from "../../../../../components/mui/formik-inputs/mui-formik-radio-group";
 import { getFileUploadAllowedExtensions } from "../../../../../utils/methods";
 
 const DocumentDownloadModule = ({ baseName, index }) => {
diff --git a/src/pages/sponsors-global/page-templates/page-template-popup/modules/page-template-info-module.js b/src/pages/sponsors-global/page-templates/page-template-popup/modules/page-template-info-module.js
index 175d4e878..0714b52b4 100644
--- a/src/pages/sponsors-global/page-templates/page-template-popup/modules/page-template-info-module.js
+++ b/src/pages/sponsors-global/page-templates/page-template-popup/modules/page-template-info-module.js
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 import T from "i18n-react/dist/i18n-react";
 import { Grid2, Box, InputLabel } from "@mui/material";
 
-import FormikTextEditor from "../../../../../components/inputs/formik-text-editor";
+import FormikTextEditor from "openstack-uicore-foundation/lib/components/mui/formik-inputs/texteditor";
 
 const InfoModule = ({ baseName, index }) => {
   const name = `${baseName}[${index}].content`;
@@ -15,7 +15,12 @@ const InfoModule = ({ baseName, index }) => {
       </InputLabel>
       <Grid2 size={12}>
         <Box width="100%">
-          <FormikTextEditor name={name} fullWidth margin="none" />
+          <FormikTextEditor
+            name={name}
+            fullWidth
+            margin="none"
+            license={process.env.JODIT_LICENSE_KEY}
+          />
         </Box>
       </Grid2>
     </Grid2>
diff --git a/src/pages/sponsors-global/page-templates/page-template-popup/modules/page-template-media-request-module.js b/src/pages/sponsors-global/page-templates/page-template-popup/modules/page-template-media-request-module.js
index 72f11853e..edb720c8f 100644
--- a/src/pages/sponsors-global/page-templates/page-template-popup/modules/page-template-media-request-module.js
+++ b/src/pages/sponsors-global/page-templates/page-template-popup/modules/page-template-media-request-module.js
@@ -1,23 +1,40 @@
-import React from "react";
+import React, { useEffect } from "react";
 import PropTypes from "prop-types";
 import T from "i18n-react/dist/i18n-react";
 import { connect } from "react-redux";
 import { getIn, useFormikContext } from "formik";
 import { Divider, Grid2, InputLabel, MenuItem } from "@mui/material";
 import MuiFormikDatepicker from "openstack-uicore-foundation/lib/components/mui/formik-inputs/datepicker";
-import MuiFormikTextField from "../../../../../components/mui/formik-inputs/mui-formik-textfield";
-import MuiFormikRadioGroup from "../../../../../components/mui/formik-inputs/mui-formik-radio-group";
-import MuiFormikFilesizeField from "../../../../../components/mui/formik-inputs/mui-formik-file-size-field";
-import { PAGE_MODULES_MEDIA_TYPES } from "../../../../../utils/constants";
-import MuiFormikSelect from "../../../../../components/mui/formik-inputs/mui-formik-select";
+import MuiFormikTextField from "openstack-uicore-foundation/lib/components/mui/formik-inputs/textfield";
+import MuiFormikRadioGroup from "openstack-uicore-foundation/lib/components/mui/formik-inputs/radio-group";
+import MuiFormikFilesizeField from "openstack-uicore-foundation/lib/components/mui/formik-inputs/file-size-field";
+import MuiFormikSelect from "openstack-uicore-foundation/lib/components/mui/formik-inputs/select";
+import {
+  COLUMN_6,
+  COLUMN_12,
+  PAGE_MODULES_MEDIA_TYPES
+} from "../../../../../utils/constants";
 
-const MediaRequestModule = ({ baseName, index, mediaFileTypes }) => {
-  const { values } = useFormikContext();
+const MediaRequestModule = ({
+  baseName,
+  index,
+  mediaFileTypes,
+  showUploadDeadline
+}) => {
+  const { values, setFieldValue } = useFormikContext();
   const buildFieldName = (field) => `${baseName}[${index}].${field}`;
 
   const mediaType =
     getIn(values, buildFieldName("type")) || PAGE_MODULES_MEDIA_TYPES.FILE;
 
+  // clears a stale upload_deadline hydrated from a legacy module once the field is hidden;
+  // only needs to run on mount, since showUploadDeadline doesn't change during a module's lifetime
+  useEffect(() => {
+    if (!showUploadDeadline) {
+      setFieldValue(buildFieldName("upload_deadline"), null);
+    }
+  }, []);
+
   const mediaTypeOptions = [
     {
       value: PAGE_MODULES_MEDIA_TYPES.FILE,
@@ -47,7 +64,7 @@ const MediaRequestModule = ({ baseName, index, mediaFileTypes }) => {
       <Grid2 size={12}>
         <Divider sx={{ mx: -2 }} />
       </Grid2>
-      <Grid2 size={6}>
+      <Grid2 size={showUploadDeadline ? COLUMN_6 : COLUMN_12}>
         <InputLabel htmlFor={buildFieldName("name")}>
           {T.translate("page_template_list.page_crud.name")}
         </InputLabel>
@@ -57,15 +74,17 @@ const MediaRequestModule = ({ baseName, index, mediaFileTypes }) => {
           margin="none"
         />
       </Grid2>
-      <Grid2 size={6}>
-        <InputLabel htmlFor={buildFieldName("upload_deadline")}>
-          {T.translate("page_template_list.page_crud.upload_deadline")}
-        </InputLabel>
-        <MuiFormikDatepicker
-          name={buildFieldName("upload_deadline")}
-          margin="none"
-        />
-      </Grid2>
+      {showUploadDeadline && (
+        <Grid2 size={6}>
+          <InputLabel htmlFor={buildFieldName("upload_deadline")}>
+            {T.translate("page_template_list.page_crud.upload_deadline")}
+          </InputLabel>
+          <MuiFormikDatepicker
+            name={buildFieldName("upload_deadline")}
+            margin="none"
+          />
+        </Grid2>
+      )}
 
       {mediaType === PAGE_MODULES_MEDIA_TYPES.FILE && (
         <>
@@ -129,7 +148,9 @@ const MediaRequestModule = ({ baseName, index, mediaFileTypes }) => {
 
 MediaRequestModule.propTypes = {
   baseName: PropTypes.string.isRequired,
-  index: PropTypes.number.isRequired
+  index: PropTypes.number.isRequired,
+  mediaFileTypes: PropTypes.array.isRequired,
+  showUploadDeadline: PropTypes.bool
 };
 
 const mapStateToProps = ({ mediaUploadState }) => ({
diff --git a/src/pages/sponsors-global/page-templates/page-template-popup/page-template-modules-form.js b/src/pages/sponsors-global/page-templates/page-template-popup/page-template-modules-form.js
index 67bf40ecc..0d7ab6d69 100644
--- a/src/pages/sponsors-global/page-templates/page-template-popup/page-template-modules-form.js
+++ b/src/pages/sponsors-global/page-templates/page-template-popup/page-template-modules-form.js
@@ -14,8 +14,8 @@ import { connect } from "react-redux";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 import DeleteIcon from "@mui/icons-material/Delete";
 import UnfoldMoreIcon from "@mui/icons-material/UnfoldMore";
-import DragAndDropList from "../../../../components/mui/dnd-list";
-import showConfirmDialog from "../../../../components/mui/showConfirmDialog";
+import DragAndDropList from "openstack-uicore-foundation/lib/components/mui/dnd-list";
+import showConfirmDialog from "openstack-uicore-foundation/lib/components/mui/show-confirm-dialog";
 import {
   DEBOUNCE_WAIT_150,
   PAGES_MODULE_KINDS
@@ -25,7 +25,11 @@ import DocumentDownloadModule from "./modules/page-template-document-download-mo
 import MediaRequestModule from "./modules/page-template-media-request-module";
 import { getAllMediaFileTypes } from "../../../../actions/media-file-type-actions";
 
-const PageModules = ({ name = "modules", getAllMediaFileTypes }) => {
+const PageModules = ({
+  name = "modules",
+  getAllMediaFileTypes,
+  isGlobal = false
+}) => {
   const { values, setFieldValue, errors, submitCount } = useFormikContext();
   const modules = getIn(values, name) || [];
   const moduleErrors = getIn(errors, name);
@@ -129,7 +133,13 @@ const PageModules = ({ name = "modules", getAllMediaFileTypes }) => {
       case PAGES_MODULE_KINDS.DOCUMENT:
         return <DocumentDownloadModule baseName={name} index={index} />;
       case PAGES_MODULE_KINDS.MEDIA:
-        return <MediaRequestModule baseName={name} index={index} />;
+        return (
+          <MediaRequestModule
+            baseName={name}
+            index={index}
+            showUploadDeadline={!isGlobal}
+          />
+        );
       default:
         return null;
     }
@@ -225,7 +235,9 @@ const PageModules = ({ name = "modules", getAllMediaFileTypes }) => {
 };
 
 PageModules.propTypes = {
-  name: PropTypes.string
+  name: PropTypes.string,
+  isGlobal: PropTypes.bool,
+  getAllMediaFileTypes: PropTypes.func.isRequired
 };
 
 const mapStateToProps = () => ({});
diff --git a/src/pages/sponsors/show-pages-list-page/__tests__/show-pages-list-page.test.js b/src/pages/sponsors/show-pages-list-page/__tests__/show-pages-list-page.test.js
index 89bbc7ef0..9df2140fc 100644
--- a/src/pages/sponsors/show-pages-list-page/__tests__/show-pages-list-page.test.js
+++ b/src/pages/sponsors/show-pages-list-page/__tests__/show-pages-list-page.test.js
@@ -41,7 +41,9 @@ jest.mock(
         <div data-testid="page-template-popup">
           <span data-testid="popup-page-id">{pageTemplate?.id}</span>
           <button onClick={onClose}>Close</button>
-          <button onClick={() => onSave({ id: 1, name: "Test" })}>Save</button>
+          <button onClick={() => onSave({ id: 1, name: "Test" }).then(onClose)}>
+            Save
+          </button>
         </div>
       );
     }
diff --git a/src/pages/sponsors/show-pages-list-page/index.js b/src/pages/sponsors/show-pages-list-page/index.js
index 2b1757d51..5cacc9475 100644
--- a/src/pages/sponsors/show-pages-list-page/index.js
+++ b/src/pages/sponsors/show-pages-list-page/index.js
@@ -125,12 +125,10 @@ const ShowPagesListPage = ({
     );
   };
 
-  const handleSaveShowPage = (entity) => {
+  const handleSaveShowPage = (entity) =>
     saveShowPage(entity).then(() => {
-      setOpenPopup(null);
       getShowPages();
     });
-  };
 
   const handleOpenPageTemplatePopup = async (row) => {
     await Promise.all([
diff --git a/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/__tests__/sponsor-pages-tab.test.js b/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/__tests__/sponsor-pages-tab.test.js
index 287193861..ad50fc03d 100644
--- a/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/__tests__/sponsor-pages-tab.test.js
+++ b/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/__tests__/sponsor-pages-tab.test.js
@@ -39,7 +39,9 @@ jest.mock(
         <div data-testid="page-template-popup">
           <span data-testid="popup-page-id">{pageTemplate?.id}</span>
           <button onClick={onClose}>Close</button>
-          <button onClick={() => onSave({ id: 1, name: "Test" })}>Save</button>
+          <button onClick={() => onSave({ id: 1, name: "Test" }).then(onClose)}>
+            Save
+          </button>
         </div>
       );
     }
diff --git a/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/index.js b/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/index.js
index 958ce85fc..3a03780c8 100644
--- a/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/index.js
+++ b/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/index.js
@@ -264,44 +264,38 @@ const SponsorPagesTab = ({
       .finally(() => setOpenPopup(null));
   };
 
-  const handleSaveCustomizedPage = (entity) => {
-    saveSponsorCustomizedPage(entity)
-      .then(() => {
-        const { perPage, order, orderDir } = customizedPages;
-        getSponsorCustomizedPages(
-          term,
-          DEFAULT_CURRENT_PAGE,
-          perPage,
-          order,
-          orderDir,
-          showArchived
-        );
-      })
-      .finally(() => setOpenPopup(null));
-  };
+  const handleSaveCustomizedPage = (entity) =>
+    saveSponsorCustomizedPage(entity).then(() => {
+      const { perPage, order, orderDir } = customizedPages;
+      getSponsorCustomizedPages(
+        term,
+        DEFAULT_CURRENT_PAGE,
+        perPage,
+        order,
+        orderDir,
+        showArchived
+      );
+    });
 
-  const handleSaveManagedPage = (entity) => {
-    saveSponsorManagedPage(entity)
-      .then(() => {
-        getSponsorManagedPages(
-          term,
-          DEFAULT_CURRENT_PAGE,
-          managedPages.perPage,
-          managedPages.order,
-          managedPages.orderDir,
-          showArchived
-        );
-        getSponsorCustomizedPages(
-          term,
-          DEFAULT_CURRENT_PAGE,
-          customizedPages.perPage,
-          customizedPages.order,
-          customizedPages.orderDir,
-          showArchived
-        );
-      })
-      .finally(() => setOpenPopup(null));
-  };
+  const handleSaveManagedPage = (entity) =>
+    saveSponsorManagedPage(entity).then(() => {
+      getSponsorManagedPages(
+        term,
+        DEFAULT_CURRENT_PAGE,
+        managedPages.perPage,
+        managedPages.order,
+        managedPages.orderDir,
+        showArchived
+      );
+      getSponsorCustomizedPages(
+        term,
+        DEFAULT_CURRENT_PAGE,
+        customizedPages.perPage,
+        customizedPages.order,
+        customizedPages.orderDir,
+        showArchived
+      );
+    });
 
   const handleClosePagePopup = () => {
     resetSponsorPage();
diff --git a/src/utils/__tests__/page-template.test.js b/src/utils/__tests__/page-template.test.js
index 60d402b48..68b7b4a81 100644
--- a/src/utils/__tests__/page-template.test.js
+++ b/src/utils/__tests__/page-template.test.js
@@ -93,6 +93,30 @@ describe("normalizePageTemplateModules", () => {
       const [result] = normalizePageTemplateModules([module]);
       expect(result.max_file_size).toBe(2048);
     });
+
+    it("should omit upload_deadline from payload when null (global template)", () => {
+      const module = {
+        kind: PAGES_MODULE_KINDS.MEDIA,
+        type: PAGE_MODULES_MEDIA_TYPES.FILE,
+        upload_deadline: null,
+        file_type_id: 3,
+        max_file_size: 1024
+      };
+      const [result] = normalizePageTemplateModules([module]);
+      expect(result).not.toHaveProperty("upload_deadline");
+    });
+
+    it("should omit upload_deadline from payload when undefined", () => {
+      const module = {
+        kind: PAGES_MODULE_KINDS.MEDIA,
+        type: PAGE_MODULES_MEDIA_TYPES.FILE,
+        upload_deadline: undefined,
+        file_type_id: 3,
+        max_file_size: 1024
+      };
+      const [result] = normalizePageTemplateModules([module]);
+      expect(result).not.toHaveProperty("upload_deadline");
+    });
   });
 
   describe("MEDIA kind — INPUT type", () => {
@@ -116,7 +140,17 @@ describe("normalizePageTemplateModules", () => {
         type: PAGE_MODULES_MEDIA_TYPES.INPUT
       };
       const [result] = normalizePageTemplateModules([module]);
-      expect(result.upload_deadline).toBeUndefined();
+      expect(result).not.toHaveProperty("upload_deadline");
+    });
+
+    it("should omit upload_deadline from payload when null (global template)", () => {
+      const module = {
+        kind: PAGES_MODULE_KINDS.MEDIA,
+        type: PAGE_MODULES_MEDIA_TYPES.INPUT,
+        upload_deadline: null
+      };
+      const [result] = normalizePageTemplateModules([module]);
+      expect(result).not.toHaveProperty("upload_deadline");
     });
   });
 
diff --git a/src/utils/constants.js b/src/utils/constants.js
index 1bef8e23f..846f53c8e 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -156,8 +156,12 @@ export const TEN_THOUSAND = 10000;
 
 export const COLUMN_4 = 4;
 
+export const COLUMN_6 = 6;
+
 export const COLUMN_8 = 8;
 
+export const COLUMN_12 = 12;
+
 export const DEFAULT_Z_INDEX = 1;
 
 export const HIGH_Z_INDEX = 9999;
diff --git a/src/utils/page-template.js b/src/utils/page-template.js
index c57d8d831..775be4541 100644
--- a/src/utils/page-template.js
+++ b/src/utils/page-template.js
@@ -46,6 +46,8 @@ export const normalizePageTemplateModules = (modules = [], timeZone = null) =>
         normalizedModule.upload_deadline = timeZone
           ? moment.tz(module.upload_deadline, timeZone).unix()
           : moment.utc(module.upload_deadline).unix();
+      } else {
+        delete normalizedModule.upload_deadline;
       }
 
       if (module.file_type_id) {
@@ -81,4 +83,3 @@ export const normalizePageTemplateModules = (modules = [], timeZone = null) =>
 
     return normalizedModule;
   });
-  
\ No newline at end of file