diff --git a/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx b/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx
index d580016912..63470acd85 100644
--- a/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx
+++ b/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx
@@ -31,12 +31,12 @@ export const AppCanvas = ({ moduleId, appId, isViewerSidebarPinned }) => {
   const currentLayout = useStore((state) => state.currentLayout, shallow);
   const queryPanelHeight = useStore((state) => state?.queryPanel?.queryPanelHeight || 0);
   const isDraggingQueryPane = useStore((state) => state.queryPanel.isDraggingQueryPane, shallow);
+  const { isAppDarkMode } = useAppDarkMode();
   const canvasBgColor = useStore((state) => state.getCanvasBackgroundColor('canvas', isAppDarkMode), shallow);
   const canvasContainerHeight = computeCanvasContainerHeight(queryPanelHeight, isDraggingQueryPane);
   const isAutoMobileLayout = useStore((state) => state.getIsAutoMobileLayout(), shallow);
   const setIsComponentLayoutReady = useStore((state) => state.setIsComponentLayoutReady, shallow);
   const canvasMaxWidth = useAppCanvasMaxWidth({ mode: currentMode });
-  const { isAppDarkMode } = useAppDarkMode();
   const editorMarginLeft = useSidebarMargin(canvasContainerRef);
   const pageSwitchInProgress = useStore((state) => state.pageSwitchInProgress);
   const setPageSwitchInProgress = useStore((state) => state.setPageSwitchInProgress);
@@ -71,8 +71,8 @@ export const AppCanvas = ({ moduleId, appId, isViewerSidebarPinned }) => {
           // transform: `scale(1)`,
           borderLeft: editorMarginLeft + 'px solid',
           height: currentMode === 'edit' ? canvasContainerHeight : '100%',
-          // backgroundColor: canvasBgColor,
-          background: !isAppDarkMode ? '#EBEBEF' : '#2E3035',
+          backgroundColor: canvasBgColor,
+          // background: !isAppDarkMode ? '#EBEBEF' : '#2E3035',
           marginLeft:
             isViewerSidebarPinned && currentLayout !== 'mobile' && currentMode !== 'edit'
               ? pageSidebarStyle === 'icon'
diff --git a/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss b/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss
index 08a387daf2..5d0f4f7398 100644
--- a/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss
+++ b/frontend/src/AppBuilder/LeftSidebar/PageMenu/style.scss
@@ -1,3 +1,9 @@
+.PopoverContent {
+    &.page {
+        min-height: unset !important;
+    }
+}
+
 .edit-page-overlay-toggle {
     opacity: 0;
     transition: opacity 0.1s;
diff --git a/frontend/src/AppBuilder/Viewer/ViewerSidebarNavigation.jsx b/frontend/src/AppBuilder/Viewer/ViewerSidebarNavigation.jsx
index 0c25f659ed..fe1bbe4c31 100644
--- a/frontend/src/AppBuilder/Viewer/ViewerSidebarNavigation.jsx
+++ b/frontend/src/AppBuilder/Viewer/ViewerSidebarNavigation.jsx
@@ -112,7 +112,7 @@ export const ViewerSidebarNavigation = ({
         borderRight: !styles?.borderColor?.isDefault ? `1px solid ${styles?.borderColor?.value}` : '',
       }}
     >
-      <div className="position-relative">
+      <div className="position-relative" style={{ height: '100%' }}>
         <ButtonSolid
           onClick={() => {
             toggleSidebarPinned();
diff --git a/frontend/src/AppBuilder/_stores/slices/appSlice.js b/frontend/src/AppBuilder/_stores/slices/appSlice.js
index 12cda11bbb..a850b96926 100644
--- a/frontend/src/AppBuilder/_stores/slices/appSlice.js
+++ b/frontend/src/AppBuilder/_stores/slices/appSlice.js
@@ -122,7 +122,6 @@ export const createAppSlice = (set, get) => ({
     const appId = get().app.appId;
     const filteredQueryParams = queryParams.filter(([key, value]) => {
       if (!value) return false;
-      if (key === 'env' && !isLicenseValid()) return false;
       return true;
     });
 
diff --git a/frontend/src/_styles/left-sidebar.scss b/frontend/src/_styles/left-sidebar.scss
index 0817aa8727..0a5b441d66 100644
--- a/frontend/src/_styles/left-sidebar.scss
+++ b/frontend/src/_styles/left-sidebar.scss
@@ -571,6 +571,13 @@
 
 .page-handler-wrapper {
   background: transparent;
+  height: 100%;
+  scrollbar-width: none;
+  overflow: auto;
+
+  &::-webkit-scrollbar {
+      display: none;
+  }
 
   .tj-list-item-selected {
     .custom-icon {