diff --git a/frontend/src/AppBuilder/AppCanvas/HotkeyProvider.jsx b/frontend/src/AppBuilder/AppCanvas/HotkeyProvider.jsx
index cf2c3471ad..018383c61f 100644
--- a/frontend/src/AppBuilder/AppCanvas/HotkeyProvider.jsx
+++ b/frontend/src/AppBuilder/AppCanvas/HotkeyProvider.jsx
@@ -136,7 +136,7 @@ export const HotkeyProvider = ({ children, mode, currentLayout, canvasMaxWidth }
       style={{
         width: currentLayout == 'mobile' ? '450px' : '100%',
         maxWidth: canvasMaxWidth,
-        // margin: '0 auto',
+        margin: '0 auto',
         transform: 'translateZ(0)',
       }}
     >
diff --git a/frontend/src/AppBuilder/_stores/slices/componentsSlice.js b/frontend/src/AppBuilder/_stores/slices/componentsSlice.js
index f28d333df8..c3efb5cd36 100644
--- a/frontend/src/AppBuilder/_stores/slices/componentsSlice.js
+++ b/frontend/src/AppBuilder/_stores/slices/componentsSlice.js
@@ -1570,7 +1570,8 @@ export const createComponentsSlice = (set, get) => ({
     const currentPageId = getCurrentPageId(moduleId);
     set(
       (state) => {
-        state.modules[moduleId].pages[state.currentPageIndex].autoComputeLayout = false;
+        const currentPageIndex = state.modules[moduleId].pages.findIndex((page) => page.id === currentPageId);
+        state.modules[moduleId].pages[currentPageIndex].autoComputeLayout = false;
       },
       false,
       'turnOffAutoComputeLayout'