diff --git a/frontend/src/AppBuilder/LeftSidebar/GlobalSettings/index.jsx b/frontend/src/AppBuilder/LeftSidebar/GlobalSettings/index.jsx
index d85917c797..9f8379f85c 100644
--- a/frontend/src/AppBuilder/LeftSidebar/GlobalSettings/index.jsx
+++ b/frontend/src/AppBuilder/LeftSidebar/GlobalSettings/index.jsx
@@ -10,12 +10,13 @@ import AppModeToggle from './AppModeToggle';
 import { ThemeSelect } from '@/modules/Appbuilder/components';
 import MaintenanceMode from './MaintenanceMode';
 import HideHeaderToggle from './HideHeaderToggle';
+import { ModuleProvider } from '@/AppBuilder/_contexts/ModuleContext';
 
 const GlobalSettings = ({ darkMode }) => {
   const shouldFreeze = useStore((state) => state.getShouldFreeze());
 
   return (
-    <>
+    <ModuleProvider moduleId={'canvas'}>
       <div>
         <div bsPrefix="global-settings-popover" className="global-settings-panel">
           <HeaderSection>
@@ -44,7 +45,7 @@ const GlobalSettings = ({ darkMode }) => {
           </div>
         </div>
       </div>
-    </>
+    </ModuleProvider>
   );
 };
 
diff --git a/frontend/src/AppBuilder/RightSideBar/Inspector/EventManager.jsx b/frontend/src/AppBuilder/RightSideBar/Inspector/EventManager.jsx
index a5f5bb2202..51493f789e 100644
--- a/frontend/src/AppBuilder/RightSideBar/Inspector/EventManager.jsx
+++ b/frontend/src/AppBuilder/RightSideBar/Inspector/EventManager.jsx
@@ -467,7 +467,7 @@ export const EventManager = ({
     if (data.label === 'run-action') return;
     return (
       <div
-        className="tw-border-x-0 tw-border-t-0 tw-border-b-[0.5px] tw-border-solid tw-my-[4px]"
+        className="tw-border-x-0 tw-border-t-0 tw-border-b-[1px] tw-border-solid tw-my-[4px]"
         style={{ borderColor: 'var(--border-weak)' }}
       ></div>
     );
diff --git a/frontend/src/AppBuilder/WidgetManager/widgets/container.js b/frontend/src/AppBuilder/WidgetManager/widgets/container.js
index 04ddf805d9..6f5e78a050 100644
--- a/frontend/src/AppBuilder/WidgetManager/widgets/container.js
+++ b/frontend/src/AppBuilder/WidgetManager/widgets/container.js
@@ -61,6 +61,7 @@ export const containerConfig = {
         top: 20,
         left: 1,
         height: 40,
+        width: 20,
       },
       displayName: 'ContainerText',
       properties: ['text'],
diff --git a/frontend/src/Editor/WidgetManager/configs/container.js b/frontend/src/Editor/WidgetManager/configs/container.js
index 04ddf805d9..6f5e78a050 100644
--- a/frontend/src/Editor/WidgetManager/configs/container.js
+++ b/frontend/src/Editor/WidgetManager/configs/container.js
@@ -61,6 +61,7 @@ export const containerConfig = {
         top: 20,
         left: 1,
         height: 40,
+        width: 20,
       },
       displayName: 'ContainerText',
       properties: ['text'],
diff --git a/frontend/src/_hooks/use-portal.jsx b/frontend/src/_hooks/use-portal.jsx
index 7732daccdf..6341f1c780 100644
--- a/frontend/src/_hooks/use-portal.jsx
+++ b/frontend/src/_hooks/use-portal.jsx
@@ -43,7 +43,7 @@ const usePortal = ({ children, ...restProps }) => {
           isCopilotEnabled={isCopilotEnabled}
         >
           <div
-            className={`editor-container ${optionalProps.cls ?? ''}`}
+            className={`editor-container codehinter-popup ${optionalProps.cls ?? ''}`}
             key={key}
             data-cy={`codehinder-popup-input-field`}
           >
diff --git a/frontend/src/_styles/theme.scss b/frontend/src/_styles/theme.scss
index 226d6e8ac4..2d3271898f 100644
--- a/frontend/src/_styles/theme.scss
+++ b/frontend/src/_styles/theme.scss
@@ -18947,6 +18947,14 @@ section.ai-message-prompt-input-wrapper {
   }
 }
 
+.codehinter-popup {
+  .single-line-codehinter-input {
+    .cm-editor {
+      max-height: 100% !important;
+    }
+  }
+}
+
 .missing-groups-modal {
   .modal-body {
     padding: 16px;
diff --git a/server/src/modules/apps/services/widget-config/container.js b/server/src/modules/apps/services/widget-config/container.js
index 04ddf805d9..6f5e78a050 100644
--- a/server/src/modules/apps/services/widget-config/container.js
+++ b/server/src/modules/apps/services/widget-config/container.js
@@ -61,6 +61,7 @@ export const containerConfig = {
         top: 20,
         left: 1,
         height: 40,
+        width: 20,
       },
       displayName: 'ContainerText',
       properties: ['text'],