diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index a3a46dbc52..bee6de0c11 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -774,6 +774,7 @@ function html_print_select(
     $order=false,
     $custom_id=null,
     $placeholder='',
+    $select2_container_class=false
 ) {
     $output = "\n";
 
@@ -1190,6 +1191,12 @@ function html_print_select(
         $output .= '</script>';
     }
 
+    if ($select2_container_class !== false) {
+        $output .= '<script>';
+        $output .= '$("#'.$id.'").data("select2").$container.addClass("'.$select2_container_class.'")';
+        $output .= '</script>';
+    }
+
     if ($return) {
         return $output;
     }
@@ -6616,7 +6623,12 @@ function html_print_input($data, $wrapper='div', $input_only=false)
                 false,
                 true,
                 true,
-                true
+                true,
+                '',
+                false,
+                null,
+                '',
+                'select2-multiselect-widget-width select2-multiselect-text-wrap'
             );
             $output .= '</li>';
 
@@ -6684,7 +6696,12 @@ function html_print_input($data, $wrapper='div', $input_only=false)
                 false,
                 true,
                 true,
-                true
+                true,
+                '',
+                false,
+                null,
+                '',
+                'select2-multiselect-widget-width select2-multiselect-text-wrap'
             );
             $output .= '</li>';
 
diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css
index 33515ffb22..943596dd5b 100644
--- a/pandora_console/include/styles/dashboards.css
+++ b/pandora_console/include/styles/dashboards.css
@@ -622,6 +622,7 @@ form.modal-dashboard
   .select2-selection__choice {
   margin: 0px;
   height: 100% !important;
+  box-sizing: border-box !important;
 }
 
 .container-tabs {
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 3319dc0f80..34bd106b1c 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -14224,3 +14224,24 @@ button.ui-button-text-only.ui-widget.sub:hover,
 .invert_filter.black-and-white {
   filter: invert(1) saturate(0) !important;
 }
+
+.select2-multiselect-widget-width {
+  max-width: 230px !important;
+}
+
+.select2-container--default.select2-multiselect-text-wrap
+  .select2-selection--multiple
+  .select2-selection__rendered {
+  box-sizing: border-box !important;
+  padding-right: 0px !important;
+}
+
+.select2-multiselect-text-wrap .select2-selection__choice {
+  text-wrap: wrap;
+  line-break: anywhere;
+  line-height: normal;
+}
+
+.select2-multiselect-text-wrap .select2-selection__choice__remove {
+  flex-basis: 0% !important;
+}