diff --git a/CHANGES.rst b/CHANGES.rst
index 37a5b93f5..4ce5384c2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,7 +6,8 @@ There's a frood who really knows where his towel is.
 1.7b3 (unreleased)
 ^^^^^^^^^^^^^^^^^^
 
-- Nothing changed yet.
+- Review multiple class selection when there are many classes (closes `#785 <https://github.com/collective/collective.cover/issues/785>`_).
+  [rodfersou]
 
 
 1.7b2 (2018-04-27)
diff --git a/src/collective/cover/browser/templates/layoutedit.pt b/src/collective/cover/browser/templates/layoutedit.pt
index 87a203ed7..d08152d05 100644
--- a/src/collective/cover/browser/templates/layoutedit.pt
+++ b/src/collective/cover/browser/templates/layoutedit.pt
@@ -26,7 +26,7 @@
         <metal:styles fill-slot="style_slot">
             <link rel="stylesheet" type="text/css" media="screen" href=""
                   tal:define="navroot context/@@plone_portal_state/navigation_root_url"
-                  tal:attributes="href string:${navroot}/++resource++collective.cover/css/layout_edit_201804251456.css" />
+                  tal:attributes="href string:${navroot}/++resource++collective.cover/css/layout_edit_201806251610.css" />
         </metal:styles>
         <metal:main fill-slot="main">
             <tal:block tal:define="can_export_layout view/can_export_layout">
diff --git a/src/collective/cover/static/css/layout_edit_201804251456.css b/src/collective/cover/static/css/layout_edit_201806251610.css
similarity index 99%
rename from src/collective/cover/static/css/layout_edit_201804251456.css
rename to src/collective/cover/static/css/layout_edit_201806251610.css
index dbb561892..73d6a3ce2 100644
--- a/src/collective/cover/static/css/layout_edit_201804251456.css
+++ b/src/collective/cover/static/css/layout_edit_201806251610.css
@@ -741,8 +741,10 @@ body .cssclasswidget-classlist
     z-index: 1001;
 
     display: flex;
+    overflow: auto;
     flex-direction: column;
 
+    max-height: 4rem;
     padding: .4rem;
 
     list-style-type: none !important;