diff --git a/frontend/ee b/frontend/ee
index 8b0a7bfa73..4becfb8ea7 160000
--- a/frontend/ee
+++ b/frontend/ee
@@ -1 +1 @@
-Subproject commit 8b0a7bfa73f281d8fbe100324ef3fd1578fd0b36
+Subproject commit 4becfb8ea76e119bfb5c5668362d5fff43755981
diff --git a/frontend/src/AppBuilder/LeftSidebar/LeftSidebar.jsx b/frontend/src/AppBuilder/LeftSidebar/LeftSidebar.jsx
index 0b70a5f5ef..ef6bf6522f 100644
--- a/frontend/src/AppBuilder/LeftSidebar/LeftSidebar.jsx
+++ b/frontend/src/AppBuilder/LeftSidebar/LeftSidebar.jsx
@@ -173,7 +173,17 @@ export const BaseLeftSidebar = ({
 
   const renderLeftSidebarItems = () => {
     if (isModuleEditor) {
-      return renderCommonItems();
+      return (
+        <>
+          {renderAISideBarTrigger({
+            darkMode,
+            setSideBarBtnRefs,
+            selectedSidebarItem,
+            handleSelectedSidebarItem,
+          })}
+          {renderCommonItems()}
+        </>
+      );
     }
     return (
       <>
diff --git a/frontend/src/AppBuilder/_hooks/useAppData.js b/frontend/src/AppBuilder/_hooks/useAppData.js
index 1d0040e166..557e2dd428 100644
--- a/frontend/src/AppBuilder/_hooks/useAppData.js
+++ b/frontend/src/AppBuilder/_hooks/useAppData.js
@@ -395,16 +395,11 @@ const useAppData = (
           moduleId
         );
 
-        if (
-          !moduleMode &&
-          state?.prompt &&
-          !promptSentRef.current &&
-          (conversation?.aiConversationMessages || []).length === 0
-        ) {
+        if (state?.prompt && !promptSentRef.current && (conversation?.aiConversationMessages || []).length === 0) {
           promptSentRef.current = true;
           setSelectedSidebarItem('tooljetai');
           toggleLeftSidebar(true);
-          sendMessage(state.prompt);
+          sendMessage(state.prompt, {}, {}, moduleId);
           setIsQueryPaneExpanded(false);
           // Clear prompt from navigation state so it doesn't re-trigger on page refresh
           const { prompt: _prompt, ...restUsrState } = window.history.state?.usr || {};
diff --git a/frontend/src/HomePage/HomePage.jsx b/frontend/src/HomePage/HomePage.jsx
index ac99510790..9d2db58205 100644
--- a/frontend/src/HomePage/HomePage.jsx
+++ b/frontend/src/HomePage/HomePage.jsx
@@ -48,6 +48,7 @@ import {
   AppTypeTab,
 } from '@/modules/dashboard/components';
 import CreateAppWithPrompt from '@/modules/AiBuilder/components/CreateAppWithPrompt';
+import CreateModuleWithPrompt from '@/modules/AiBuilder/components/CreateModuleWithPrompt';
 import SolidIcon from '@/_ui/Icon/SolidIcons';
 import { isWorkflowsFeatureEnabled } from '@/modules/common/helpers/utils';
 import EmptyModuleSvg from '../../assets/images/icons/empty-modules.svg';
@@ -1862,6 +1863,8 @@ class HomePageComponent extends React.Component {
                   <CreateAppWithPrompt createApp={this.createApp} />
                 )}
 
+                {this.props.appType === 'module' && this.canCreateApp() && <CreateModuleWithPrompt />}
+
                 {(meta?.total_count > 0 || appSearchKey) && (
                   <>
                     {!(isLoading && !appSearchKey) && (
diff --git a/frontend/src/modules/AiBuilder/components/CreateModuleWithPrompt/CreateModuleWithPrompt.jsx b/frontend/src/modules/AiBuilder/components/CreateModuleWithPrompt/CreateModuleWithPrompt.jsx
new file mode 100644
index 0000000000..877a19e3fc
--- /dev/null
+++ b/frontend/src/modules/AiBuilder/components/CreateModuleWithPrompt/CreateModuleWithPrompt.jsx
@@ -0,0 +1,8 @@
+import React from 'react';
+import { withEditionSpecificComponent } from '@/modules/common/helpers/withEditionSpecificComponent';
+
+const CreateModuleWithPrompt = () => {
+  return <></>;
+};
+
+export default withEditionSpecificComponent(CreateModuleWithPrompt, 'AiBuilder');
diff --git a/frontend/src/modules/AiBuilder/components/CreateModuleWithPrompt/index.js b/frontend/src/modules/AiBuilder/components/CreateModuleWithPrompt/index.js
new file mode 100644
index 0000000000..deaa23e170
--- /dev/null
+++ b/frontend/src/modules/AiBuilder/components/CreateModuleWithPrompt/index.js
@@ -0,0 +1 @@
+export { default } from './CreateModuleWithPrompt';
diff --git a/server/ee b/server/ee
index e3a079650c..909d05c745 160000
--- a/server/ee
+++ b/server/ee
@@ -1 +1 @@
-Subproject commit e3a079650c47564f82e9cc7ee26473f29ff06f20
+Subproject commit 909d05c7459f8c239c30d2b7522b2226cf1788cf