diff --git a/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php b/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php
index 9b74b0632e..c602f8b7cb 100755
--- a/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php
+++ b/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php
@@ -301,10 +301,15 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
             $this->updateAttributes(array('style' => 'min-width:180px;'));
         }
         $this->_tableAttributes = $this->getAttribute('class');
+        $attr = null;
         if (is_null($this->_tableAttributes)) {
-            // default table layout
-            $attr = array('border' => '0', 'cellpadding' => '10', 'cellspacing' => '0');
+            $this->updateAttributes(array('class' => 'col-md-4'));
         } else {
+        /*
+        if (is_null($this->_tableAttributes)) {
+            // default table layout
+            $attr = array('border' => '0', 'cellpadding' => '10', 'cellspacing' => '0');*/
+        //} else {
             $attr = array('class' => $this->_tableAttributes);
             $this->_removeAttr('class', $this->_attributes);
         }
@@ -537,13 +542,13 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
             $this->_elementTemplate = $html;
         } else {
             $this->_elementTemplate = '
-{javascript}
-<div class="row">
-  <div class="col-sm-5"><!-- BEGIN label_2 -->{label_2}<!-- END label_2 --> {unselected}</div>
-  <div class="col-sm-2"><div class="text-center">{add}{remove}</div></div>
-  <div class="col-sm-5"><!-- BEGIN label_3 -->{label_3}<!-- END label_3 -->{selected}</div>
-</div>
-';
+            {javascript}
+            <div class="row">
+              <div class="col-sm-5"><!-- BEGIN label_2 -->{label_2}<!-- END label_2 --> {unselected}</div>
+              <div class="col-sm-2"><div class="text-center">{add}{remove}</div></div>
+              <div class="col-sm-5"><!-- BEGIN label_3 -->{label_3}<!-- END label_3 -->{selected}</div>
+            </div>
+            ';
         }
         if ($js == false) {
             $this->_elementTemplate = str_replace('{javascript}', '',
@@ -798,6 +803,7 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
             }
             $strHtmlUnselected .= '</select>';
 
+            $strHtmlUnselected = '<input placeholder="'.get_lang('Search').'" id="'.$selectId.'-f-filter" type="text" class="search-query select_class_filter"><br /><br />'.$strHtmlUnselected;
             // The 'selected' multi-select which appears on the right
             $selected_count = count($arrHtmlSelected);
 
@@ -829,6 +835,8 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
             }
             $strHtmlSelected .= '</select>';
 
+            $strHtmlSelected = '<input placeholder="'.get_lang('Search').'" id="'.$selectId.'-t-filter" type="text" class="search-query select_class_filter"><br /><br />'.$strHtmlSelected;
+
             // The 'hidden' multi-select
             $strHtmlHidden = "<select$attrHidden>". PHP_EOL;
             if (count($arrHtmlHidden) > 0) {
@@ -988,26 +996,45 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
         }
 
         $placeHolders = array(
-            '{stylesheet}', '{javascript}',
+            '{stylesheet}',
+            '{javascript}',
             '{class}',
-            '{unselected_count_id}', '{selected_count_id}',
-            '{unselected_count}', '{selected_count}',
-            '{unselected}', '{selected}',
-            '{add}', '{remove}',
-            '{all}', '{none}', '{toggle}',
-            '{moveup}', '{movedown}',
-            '{movetop}', '{movebottom}'
+            '{unselected_count_id}',
+            '{selected_count_id}',
+            '{unselected_count}',
+            '{selected_count}',
+            '{unselected}',
+            '{selected}',
+            '{add}',
+            '{remove}',
+            '{all}',
+            '{none}',
+            '{toggle}',
+            '{moveup}',
+            '{movedown}',
+            '{movetop}',
+            '{movebottom}',
         );
+
         $htmlElements = array(
-            $this->getElementCss(false), $this->getElementJs(false),
+            $this->getElementCss(false),
+            $this->getElementJs(false),
             $this->_tableAttributes,
-            $strHtmlUnselectedCountId, $strHtmlSelectedCountId,
-            $strHtmlUnselectedCount, $strHtmlSelectedCount,
-            $strHtmlUnselected, $strHtmlSelected . $strHtmlHidden,
-            $strHtmlAdd, $strHtmlRemove,
-            $strHtmlAll, $strHtmlNone, $strHtmlToggle,
-            $strHtmlMoveUp, $strHtmlMoveDown,
-            $strHtmlMoveTop, $strHtmlMoveBottom
+            $strHtmlUnselectedCountId,
+            $strHtmlSelectedCountId,
+            $strHtmlUnselectedCount,
+            $strHtmlSelectedCount,
+            $strHtmlUnselected,
+            $strHtmlSelected.$strHtmlHidden,
+            $strHtmlAdd,
+            $strHtmlRemove,
+            $strHtmlAll,
+            $strHtmlNone,
+            $strHtmlToggle,
+            $strHtmlMoveUp,
+            $strHtmlMoveDown,
+            $strHtmlMoveTop,
+            $strHtmlMoveBottom,
         );
 
         if ($this->selectAllCheckBox) {
@@ -1023,7 +1050,6 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
         }
 
         $strHtml = str_replace($placeHolders, $htmlElements, $strHtml);
-
         $comment = $this->getComment();
 
         if (!empty($comment)) {
diff --git a/main/template/default/layout/footer.tpl b/main/template/default/layout/footer.tpl
index 2f505e1295..cb90f7e22a 100755
--- a/main/template/default/layout/footer.tpl
+++ b/main/template/default/layout/footer.tpl
@@ -152,6 +152,13 @@
             disable_search_threshold: 10
         });
 
+        // Adv multi-select search input.
+        $('.select_class_filter').on('focus', function() {
+            var inputId = $(this).attr('id');
+            inputId = inputId.replace('-filter', '');
+            $("#"+ inputId).filterByText($("#"+inputId+"-filter"));
+        });
+
         $(".jp-jplayer audio").addClass('skip');
 
         // Mediaelement
@@ -181,6 +188,34 @@
         };
         $('.boot-tooltip').tooltip(tip_options);
     });
+
+    // @todo move in a chamilo.js js lib.
+
+    jQuery.fn.filterByText = function(textbox) {
+        return this.each(function() {
+            var select = this;
+            var options = [];
+            $(select).find('option').each(function() {
+                options.push({value: $(this).val(), text: $(this).text()});
+            });
+            $(select).data('options', options);
+
+            $(textbox).bind('change keyup', function() {
+                var options = $(select).empty().data('options');
+                var search = $.trim($(this).val());
+                var regex = new RegExp(search,"gi");
+
+                $.each(options, function(i) {
+                    var option = options[i];
+                    if(option.text.match(regex) !== null) {
+                        $(select).append(
+                            $('<option>').text(option.text).val(option.value)
+                        );
+                    }
+                });
+            });
+        });
+    };
 </script>
 
 {{ execution_stats }}