diff --git a/platform/ui/src/components/ohifModal/OHIFModal.js b/platform/ui/src/components/ohifModal/OHIFModal.js
index 1bdf5e45e..483c650f9 100644
--- a/platform/ui/src/components/ohifModal/OHIFModal.js
+++ b/platform/ui/src/components/ohifModal/OHIFModal.js
@@ -35,7 +35,6 @@ const OHIFModal = ({
     <ReactBootstrapModal.Body>{children}</ReactBootstrapModal.Body>
     {Footer && (
       <ReactBootstrapModal.Footer>
-        {' '}
         <Footer hide={onHide} />
       </ReactBootstrapModal.Footer>
     )}
@@ -50,8 +49,16 @@ OHIFModal.propTypes = {
   show: PropTypes.bool,
   title: PropTypes.string,
   onHide: PropTypes.func,
-  footer: PropTypes.node,
-  header: PropTypes.node,
+  footer: PropTypes.oneOfType([
+    PropTypes.arrayOf(PropTypes.node),
+    PropTypes.node,
+    PropTypes.func,
+  ]),
+  header: PropTypes.oneOfType([
+    PropTypes.arrayOf(PropTypes.node),
+    PropTypes.node,
+    PropTypes.func,
+  ]),
   children: PropTypes.oneOfType([
     PropTypes.arrayOf(PropTypes.node),
     PropTypes.node,
diff --git a/platform/ui/src/utils/ModalProvider.js b/platform/ui/src/utils/ModalProvider.js
index 16eb7ee71..0b752cfaf 100644
--- a/platform/ui/src/utils/ModalProvider.js
+++ b/platform/ui/src/utils/ModalProvider.js
@@ -74,9 +74,9 @@ const ModalProvider = ({ children, modal: Modal, service }) => {
           show={options.show}
           title={options.title}
           closeButton={options.closeButton}
-          onHide={hide}
           footer={options.footer}
           header={options.header}
+          onHide={hide}
         >
           <Component {...options} show={show} hide={hide} />
         </Modal>