diff --git a/platform/ui/src/utils/ModalProvider.js b/platform/ui/src/utils/ModalProvider.js
index 4ef1c4bf4..e962b2060 100644
--- a/platform/ui/src/utils/ModalProvider.js
+++ b/platform/ui/src/utils/ModalProvider.js
@@ -111,7 +111,8 @@ ModalProvider.propTypes = {
  */
 export const withModal = Component => {
   return function WrappedComponent(props) {
-    return <Component {...props} modalContext={{ ...useModal() }} />;
+    const { show, hide } = useModal();
+    return <Component {...props} modal={{ show, hide }} />;
   };
 };
 
diff --git a/platform/viewer/src/components/Header/Header.js b/platform/viewer/src/components/Header/Header.js
index 882c065d5..9da9f401f 100644
--- a/platform/viewer/src/components/Header/Header.js
+++ b/platform/viewer/src/components/Header/Header.js
@@ -20,7 +20,7 @@ class Header extends Component {
     t: PropTypes.func.isRequired,
     userManager: PropTypes.object,
     user: PropTypes.object,
-    modalContext: PropTypes.object,
+    modal: PropTypes.object,
   };
 
   static defaultProps = {
@@ -40,7 +40,7 @@ class Header extends Component {
       t,
       user,
       userManager,
-      modalContext: { show },
+      modal: { show },
     } = this.props;
     this.options = [
       {
diff --git a/platform/viewer/src/connectedComponents/ToolbarRow.js b/platform/viewer/src/connectedComponents/ToolbarRow.js
index fe13d3919..007da4335 100644
--- a/platform/viewer/src/connectedComponents/ToolbarRow.js
+++ b/platform/viewer/src/connectedComponents/ToolbarRow.js
@@ -287,7 +287,7 @@ function _handleBuiltIn({ behavior } = {}) {
   }
 
   if (behavior === 'DOWNLOAD_SCREEN_SHOT') {
-    this.props.modalContext.show(ConnectedViewportDownloadForm, {
+    this.props.modal.show(ConnectedViewportDownloadForm, {
       title: this.props.t('Download High Quality Image'),
       customClassName: 'ViewportDownloadForm',
     });