diff --git a/web/concrete/elements/custom_style.php b/web/concrete/elements/custom_style.php
index <HASH>..<HASH> 100644
--- a/web/concrete/elements/custom_style.php
+++ b/web/concrete/elements/custom_style.php
@@ -82,9 +82,8 @@ $alignmentOptions = array(
 );
 
 
-$customClassesSelect = array(
-    '' => t('None')
-);
+$customClassesSelect = array();
+
 if (is_array($customClasses)) {
     foreach($customClasses as $class) {
         $customClassesSelect[$class] = $class;
@@ -302,7 +301,7 @@ $form = Core::make('helper/form');
 
             <div>
                 <?=t('Custom Class')?>
-                <?=$form->select('customClass', $customClassesSelect, $customClass);?>
+                <?= $form->text('customClass', $customClass);?>
             </div>
             <hr/>
 
@@ -337,4 +336,5 @@ $form = Core::make('helper/form');
 
 <script type="text/javascript">
     $('#ccm-inline-design-form').<?=$method?>();
+    $("#customClass").select2({tags:<?= json_encode(array_values($customClassesSelect)); ?>, separator: " "});
 </script>
\ No newline at end of file
Convert custom block class selection into a select2 tag selection field to support custom and multiple classes.


Former-commit-id: <I>d<I>e<I>debf<I>aad0fff8bc<I>e<I>