diff --git a/packages/ui-toolkit/package.json b/packages/ui-toolkit/package.json
index 03c05fac..f1576279 100644
--- a/packages/ui-toolkit/package.json
+++ b/packages/ui-toolkit/package.json
@@ -124,4 +124,4 @@
     "lodash.debounce": "^4.0.8",
     "react-waypoint": "^10.1.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/ui-toolkit/src/components/atoms/Accordion/Accordion.tsx b/packages/ui-toolkit/src/components/atoms/Accordion/Accordion.tsx
index 4be6e34b..9cf7707f 100644
--- a/packages/ui-toolkit/src/components/atoms/Accordion/Accordion.tsx
+++ b/packages/ui-toolkit/src/components/atoms/Accordion/Accordion.tsx
@@ -156,7 +156,8 @@ const MutableAccordion = (props: Props) => {
         : <div style={
           {
             ...childStyle,
-            display: 'grid' // to ensure margin is included in the height of the parent container, flex has some issues.
+            display: 'grid', // to ensure margin is included in the height of the parent container, flex has some issues.,
+            gridTemplateColumns: '100%' // to ensure no overflow in x direction
           }
         }
         className={childClass}
diff --git a/packages/ui-toolkit/src/components/atoms/Accordion/AnimateHeight/animateHeightUtils.ts b/packages/ui-toolkit/src/components/atoms/Accordion/AnimateHeight/animateHeightUtils.ts
index ea1bdf4f..b3edb9ea 100644
--- a/packages/ui-toolkit/src/components/atoms/Accordion/AnimateHeight/animateHeightUtils.ts
+++ b/packages/ui-toolkit/src/components/atoms/Accordion/AnimateHeight/animateHeightUtils.ts
@@ -22,7 +22,17 @@ export const PROPS_TO_OMIT = [
   'easing',
   'height',
   'onAnimationEnd',
-  'onAnimationStart'
+  'onAnimationStart',
+  'onMountOpen',
+  'showRightIcon',
+  'parentClass',
+  'headerClass',
+  'iconClass',
+  'titleClass',
+  'useAnimateHeight',
+  'mutable',
+  'onToggleCallback',
+  'maxHeight'
 ];