diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index ceffd7bb1f..3c3717b1cb 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -18,15 +18,23 @@
                     {% for collection in base["collections"] %}
                         {% set base_id = collection["base_id"] %}
                         <li class="clkbas">
-                            <label style="line-height: 18px;" onclick="infoSbas($('#ck_{{base_id}}_{{unique_id}}'),{{sbas_id}}, false, event); return false;"
-                                for="ck_{{base_id}}_{{unique_id}}" class="ck_{{base_id}} {% if collection["selected"] %}selected{% endif %} checkbox">
-                                {{base_id|get_collection_logo(app)|raw}} {{base_id|bas_names(app)}}
-                                <input class="ck_{{collection["base_id"]}} checkbas" style="*margin-top:-18px;"
-                                    onclick="cancelEvent(event);return false;"
-                                    onmousedown="infoSbas(this, {{sbas_id}}, false, event); return false;"
-                                    id="ck_{{collection["base_id"]}}_{{unique_id}}" type="checkbox"
-                                    name="bases[]" value="{{collection["base_id"]}}" {% if collection["selected"] %}checked="checked"{% endif %} />
-                            </label>
+                            <table>
+                                <tr>
+                                    <td>
+                                        <input class="ck_{{collection["base_id"]}} checkbas" style="*margin-top:-18px;"
+                                            onclick="cancelEvent(event);return false;"
+                                            onmousedown="infoSbas(this, {{sbas_id}}, false, event); return false;"
+                                            id="ck_{{collection["base_id"]}}_{{unique_id}}" type="checkbox"
+                                            name="bas[]" value="{{collection["base_id"]}}" {% if collection["selected"] %}checked="checked"{% endif %} />
+                                    </td>
+                                    <td>
+                                        <label style="line-height: 18px;" onclick="infoSbas($('#ck_{{base_id}}_{{unique_id}}'),{{sbas_id}}, false, event); return false;"
+                                            for="ck_{{base_id}}_{{unique_id}}" class="ck_{{base_id}} {% if collection["selected"] %}selected{% endif %} checkbox">
+                                            {{base_id|get_collection_logo(app)|raw}} {{base_id|bas_names(app)}}
+                                        </label>
+                                    </td>
+                                </tr>
+                            </table>
                         </li>
                     {% endfor %}
                 </ul>
diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css
index c00f222534..08d4f38943 100644
--- a/www/skins/prod/000000/prodcolor.css
+++ b/www/skins/prod/000000/prodcolor.css
@@ -1862,17 +1862,22 @@ H4 {
 }
 
 .clkbas {
-    white-space: nowrap;
+    white-space: normal;
     margin:0 5px;
+    -webkit-column-break-inside:avoid;
+    -moz-column-break-inside:avoid;
+    -o-column-break-inside:avoid;
+    -ms-column-break-inside:avoid;
+    column-break-inside:avoid;
 }
 
-.clkbas label {
+#searchForm .clkbas label {
     color: #AAAAAA;
     overflow: hidden;
     text-overflow: ellipsis;
 }
 
-.clkbas label.selected {
+#searchForm .clkbas label.selected {
     color: #FFFFFF;
 }
 
diff --git a/www/skins/prod/959595/prodcolor.css b/www/skins/prod/959595/prodcolor.css
index 2159aac105..f7652b5b0c 100644
--- a/www/skins/prod/959595/prodcolor.css
+++ b/www/skins/prod/959595/prodcolor.css
@@ -1923,17 +1923,22 @@ H4 {
 }
 
 .clkbas {
-    white-space: nowrap;
+    white-space: normal;
     margin:0 5px;
+    -webkit-column-break-inside:avoid;
+    -moz-column-break-inside:avoid;
+    -o-column-break-inside:avoid;
+    -ms-column-break-inside:avoid;
+    column-break-inside:avoid;
 }
 
-.clkbas label {
+#searchForm .clkbas label {
     color: #999999;
     overflow: hidden;
     text-overflow: ellipsis;
 }
 
-.clkbas label.selected {
+#searchForm .clkbas label.selected {
     color: #555555;
 }