diff --git a/frontend/src/Editor/EditorFunc.jsx b/frontend/src/Editor/EditorFunc.jsx
index c4cccb8d58..df11bf5dc5 100644
--- a/frontend/src/Editor/EditorFunc.jsx
+++ b/frontend/src/Editor/EditorFunc.jsx
@@ -1435,6 +1435,7 @@ const EditorComponent = (props) => {
     updateQueryConfirmationList: updateQueryConfirmationList,
     navigate: props.navigate,
     switchPage: switchPage,
+    currentPageId: currentPageId,
   };
 
   if (isLoading) {
diff --git a/frontend/src/_helpers/appUtils.js b/frontend/src/_helpers/appUtils.js
index 797d98939b..67faeef41f 100644
--- a/frontend/src/_helpers/appUtils.js
+++ b/frontend/src/_helpers/appUtils.js
@@ -354,7 +354,7 @@ function showModal(_ref, modal, show) {
     return Promise.resolve();
   }
 
-  const modalMeta = _ref.appDefinition.pages[_ref.state.currentPageId].components[modalId]; //! NeedToFix
+  const modalMeta = _ref.appDefinition.pages[_ref.currentPageId].components[modalId]; //! NeedToFix
 
   const _components = {
     ...getCurrentState().components,