diff --git a/app/client/packages/design-system/widgets/src/components/Flex/src/flexCss.ts b/app/client/packages/design-system/widgets/src/components/Flex/src/flexCss.ts
index d1f81e4d94..c17502d67f 100644
--- a/app/client/packages/design-system/widgets/src/components/Flex/src/flexCss.ts
+++ b/app/client/packages/design-system/widgets/src/components/Flex/src/flexCss.ts
@@ -97,7 +97,7 @@ export const containerDimensionStyles = <T = FlexCssProps[keyof FlexCssProps]>(
       if (current !== "base") {
         return (
           prev +
-          `@container (min-width: ${current}) {& {
+          `@container flex-container (min-width: ${current}) {& {
           ${cssProp}: ${
             //@ts-expect-error: type mismatch
             callback ? callback(value[current], extraProps) : value[current]
diff --git a/app/client/packages/design-system/widgets/src/components/Flex/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Flex/src/styles.module.css
index 140e79c428..82ff265193 100644
--- a/app/client/packages/design-system/widgets/src/components/Flex/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/Flex/src/styles.module.css
@@ -1,5 +1,6 @@
 .flexContainer {
   container-type: inline-size;
+  container-name: flex-container;
   display: flex;
   justify-content: center;
   width: 100%;
diff --git a/app/client/src/layoutSystems/anvil/layoutComponents/components/styles.css b/app/client/src/layoutSystems/anvil/layoutComponents/components/styles.css
index 89d39bbec9..b8b8c1ca74 100644
--- a/app/client/src/layoutSystems/anvil/layoutComponents/components/styles.css
+++ b/app/client/src/layoutSystems/anvil/layoutComponents/components/styles.css
@@ -1,3 +1,4 @@
 .make-container {
   container-type: inline-size;
+  container-name: flex-container;
 }
diff --git a/app/client/src/sagas/TemplatesSagas.ts b/app/client/src/sagas/TemplatesSagas.ts
index dbca5a909c..b63a466a39 100644
--- a/app/client/src/sagas/TemplatesSagas.ts
+++ b/app/client/src/sagas/TemplatesSagas.ts
@@ -49,7 +49,6 @@ import { getAllPageIdentities } from "./selectors";
 import {
   openCarbonModal,
   setCreateAgentModalOpen,
-  toggleFCIntegrations,
 } from "ee/actions/aiAgentActions";
 import { getIsAiAgentFlowEnabled } from "ee/selectors/aiAgentSelectors";
 import { getTemplatesByFlagSelector } from "selectors/templatesSelectors";
@@ -116,7 +115,6 @@ function* importTemplateToWorkspaceSaga(
 
         if (isScratchTemplate) {
           yield put(openCarbonModal({ shouldOpen: true }));
-          yield put(toggleFCIntegrations({ isEnabled: true }));
         }
 
         yield put(setCreateAgentModalOpen({ isOpen: false }));
diff --git a/app/client/src/widgets/TableWidgetV2/widget/index.tsx b/app/client/src/widgets/TableWidgetV2/widget/index.tsx
index 1f6b595061..c96d88ff24 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/TableWidgetV2/widget/index.tsx
@@ -1045,14 +1045,14 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
 
     // Reset widget state when infinite scroll is initially enabled
     // This should come after all updateInfiniteScrollProperties are done
-    if (!prevProps.infiniteScrollEnabled && infiniteScrollEnabled) {
-      this.resetTableForInfiniteScroll();
-    }
+    const didInfiniteScrollEnabledChange =
+      prevProps.infiniteScrollEnabled !== infiniteScrollEnabled;
+    const didComponentHeightChange =
+      prevProps.componentHeight !== componentHeight;
 
-    // Reset widget state when height changes while infinite scroll is enabled
     if (
-      infiniteScrollEnabled &&
-      prevProps.componentHeight !== componentHeight
+      didInfiniteScrollEnabledChange ||
+      (infiniteScrollEnabled && didComponentHeightChange)
     ) {
       this.resetTableForInfiniteScroll();
     }