diff --git a/src/components/FilterMenuModal/FilterMenuModal.js b/src/components/FilterMenuModal/FilterMenuModal.js
index d70c368a6..0f90eb50e 100644
--- a/src/components/FilterMenuModal/FilterMenuModal.js
+++ b/src/components/FilterMenuModal/FilterMenuModal.js
@@ -191,7 +191,7 @@ const FilterMenuModal = ({
                       )}
                       {applyButton && !withoutApplyButton && (
                         <Button
-                          disabled={isEqual(filtersData.values, formState.values)}
+                          disabled={isEqual(filtersData?.values, formState.values)}
                           id="filter-apply-btn"
                           variant={applyButton.variant}
                           label={applyButton.label}
diff --git a/src/components/JobWizard/JobWizard.js b/src/components/JobWizard/JobWizard.js
index 7d25b2f52..3474ab4fc 100644
--- a/src/components/JobWizard/JobWizard.js
+++ b/src/components/JobWizard/JobWizard.js
@@ -124,11 +124,14 @@ const JobWizard = ({
   const formStateRef = useRef(null)
 
   const closeModal = useCallback(() => {
+    if (showSchedule) {
+      setShowSchedule(false)
+    }
     dispatch(resetModalFilter(JOB_WIZARD_FILTERS))
     removeJobFunction()
     onResolve()
     onWizardClose && onWizardClose()
-  }, [dispatch, onResolve, onWizardClose, removeJobFunction])
+  }, [dispatch, onResolve, onWizardClose, removeJobFunction, showSchedule])
 
   const { handleCloseModal, resolveModal } = useModalBlockHistory(closeModal, formRef.current)
 
@@ -398,8 +401,8 @@ const JobWizard = ({
           label: isBatchInference
             ? 'Schedule Infer'
             : isTrain
-              ? 'Schedule training job'
-              : 'Schedule for later',
+            ? 'Schedule training job'
+            : 'Schedule for later',
           onClick: () => {
             formState.handleSubmit()
 
@@ -419,10 +422,10 @@ const JobWizard = ({
             mode === PANEL_EDIT_MODE
               ? 'Save'
               : isBatchInference
-                ? 'Infer now'
-                : isTrain
-                  ? 'Run training now'
-                  : 'Run',
+              ? 'Infer now'
+              : isTrain
+              ? 'Run training now'
+              : 'Run',
           onClick: () => {
             submitRequest(formState, false, goToFirstInvalidStep)
           },