diff --git a/frontend/ee b/frontend/ee
index 0ae5dac299..a2aaf14252 160000
--- a/frontend/ee
+++ b/frontend/ee
@@ -1 +1 @@
-Subproject commit 0ae5dac299e4a72e219243255722fbea2f530808
+Subproject commit a2aaf14252bfe033d52c37675bfc75aa03bf9389
diff --git a/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx b/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx
index 12d33283c8..b48143f383 100644
--- a/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx
+++ b/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx
@@ -182,7 +182,7 @@ export const AppCanvas = ({ appId, isViewer = false, switchDarkMode, darkMode })
           )}
           style={canvasContainerStyles}
         >
-          {showOnDesktop && (
+          {showOnDesktop && appType !== 'module' && (
             <PagesSidebarNavigation
               showHeader={showHeader}
               isMobileDevice={currentLayout === 'mobile'}
@@ -202,6 +202,7 @@ export const AppCanvas = ({ appId, isViewer = false, switchDarkMode, darkMode })
               scrollbarWidth: 'none',
               overflow: 'auto',
               width: currentMode === 'view' ? `calc(100% - ${isViewerSidebarPinned ? '0px' : '0px'})` : '100%',
+              ...(appType === 'module' && isModuleMode && { height: 'inherit' }),
             }}
             className={`app-${appId} _tooljet-page-${getPageId()}`}
           >
@@ -213,7 +214,7 @@ export const AppCanvas = ({ appId, isViewer = false, switchDarkMode, darkMode })
               {environmentLoadingState !== 'loading' && (
                 <div>
                   <Container
-                    id="canvas"
+                    id={moduleId}
                     gridWidth={gridWidth}
                     canvasWidth={canvasWidth}
                     canvasHeight={canvasHeight}
diff --git a/frontend/src/AppBuilder/RightSideBar/RightSidebarToggle.jsx b/frontend/src/AppBuilder/RightSideBar/RightSidebarToggle.jsx
index 76d9347160..7f37aecd1f 100644
--- a/frontend/src/AppBuilder/RightSideBar/RightSidebarToggle.jsx
+++ b/frontend/src/AppBuilder/RightSideBar/RightSidebarToggle.jsx
@@ -6,6 +6,7 @@ import Tooltip from 'react-bootstrap/Tooltip';
 import './rightSidebarToggle.scss';
 import SolidIcon from '@/_ui/Icon/SolidIcons';
 import { RIGHT_SIDE_BAR_TAB } from '@/AppBuilder/RightSideBar/rightSidebarConstants';
+import { useModuleContext } from '@/AppBuilder/_contexts/ModuleContext';
 import { SidebarItem } from './SidebarItem';
 
 const RightSidebarToggle = ({ darkMode = false }) => {
@@ -13,6 +14,7 @@ const RightSidebarToggle = ({ darkMode = false }) => {
     (state) => [state.isRightSidebarOpen, state.setRightSidebarOpen],
     shallow
   );
+  const { appType } = useModuleContext();
   const setActiveRightSideBarTab = useStore((state) => state.setActiveRightSideBarTab);
   const activeRightSideBarTab = useStore((state) => state.activeRightSideBarTab);
   const isRightSidebarPinned = useStore((state) => state.isRightSidebarPinned);
@@ -50,16 +52,18 @@ const RightSidebarToggle = ({ darkMode = false }) => {
         className={`left-sidebar-item left-sidebar-layout left-sidebar-inspector`}
         tip="Component properties"
       />
-      <SidebarItem
-        selectedSidebarItem={activeRightSideBarTab === RIGHT_SIDE_BAR_TAB.PAGES}
-        onClick={() => {
-          handleToggle(RIGHT_SIDE_BAR_TAB.PAGES);
-        }}
-        darkMode={darkMode}
-        icon="file01"
-        className={`left-sidebar-item left-sidebar-layout left-sidebar-inspector`}
-        tip="Page settings"
-      />
+      {appType !== 'module' && (
+        <SidebarItem
+          selectedSidebarItem={activeRightSideBarTab === RIGHT_SIDE_BAR_TAB.PAGES}
+          onClick={() => {
+            handleToggle(RIGHT_SIDE_BAR_TAB.PAGES);
+          }}
+          darkMode={darkMode}
+          icon="file01"
+          className={`left-sidebar-item left-sidebar-layout left-sidebar-inspector`}
+          tip="Page settings"
+        />
+      )}
     </div>
   );
 };
diff --git a/frontend/src/AppBuilder/_contexts/ModuleContext.jsx b/frontend/src/AppBuilder/_contexts/ModuleContext.jsx
index d0f2b96c31..b216743ed2 100644
--- a/frontend/src/AppBuilder/_contexts/ModuleContext.jsx
+++ b/frontend/src/AppBuilder/_contexts/ModuleContext.jsx
@@ -13,7 +13,7 @@ export const ModuleProvider = ({ moduleId, isModuleMode, appType, isModuleEditor
 export const useModuleContext = () => {
   const context = useContext(ModuleContext);
   if (!context) {
-    throw new Error('useModuleContext must be used within a ModuleProvider');
+    return { moduleId: 'canvas', isModuleMode: false, isModuleEditor: false };
   }
   return context;
 };
@@ -21,7 +21,7 @@ export const useModuleContext = () => {
 export const useModuleId = () => {
   const context = useContext(ModuleContext);
   if (!context) {
-    throw new Error('useModuleId must be used within a ModuleProvider');
+    return 'canvas';
   }
 
   return context.moduleId;