diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/MenuList.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/MenuList.js
index 0d8490f3cf..55e3877a2c 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/MenuList.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/MenuList.js
@@ -35,7 +35,7 @@ const MenuList = ({
             return (
               <li key={categoryName}>
                 <Category categoryName={categoryName} />
-                <Ul style={{ marginTop: '-4px' }}>
+                <Ul style={{ marginTop: '-4px' }} maxHeight="100%">
                   {componentsGroupedByCategory[categoryName].map(component => {
                     if (
                       (isAddingAComponentToAnotherComponent &&
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/SelectMenuUl/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/SelectMenuUl/index.js
index 54c857a44c..7dc79a9cc3 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/SelectMenuUl/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/SelectMenuUl/index.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const Ul = styled.ul`
-  max-height: 150px;
+  max-height: ${props => props.maxHeight};
   padding: 0 15px;
   background-color: #fff;
   list-style: none;
@@ -59,4 +59,8 @@ const Ul = styled.ul`
   }
 `;
 
+Ul.defaultProps = {
+  maxHeight: '150px',
+};
+
 export default Ul;