diff --git a/app/views/timelines/_custom_fields.html.erb b/app/views/timelines/_custom_fields.html.erb
index 023b1f5924..5cbe8b25d6 100644
--- a/app/views/timelines/_custom_fields.html.erb
+++ b/app/views/timelines/_custom_fields.html.erb
@@ -46,17 +46,21 @@ custom_fields.each do |custom_field|
                                 [l('timelines.filter.noneElement'), '-1'],
                                 [l('general_text_Yes'), '1'],
                                 [l('general_text_No'), '0']
-                              ], timeline.custom_fields_filter[custom_field.id.to_s]),
-                              class: "cf_boolean_select"
+                              ],
+                              timeline.custom_fields_filter[custom_field.id.to_s]),
+                              class: "cf_boolean_select",
+                              container_class: '-wide'
       %>
     <% elsif custom_field.field_format == 'list' %>
-      <%= hidden_field_tag("timeline[options][custom_fields][#{custom_field.id.to_s}][]",
-            timeline.custom_field_list_value(custom_field.id.to_s),
-            {
-              :"data-values" => list_to_select_object_with_none(custom_field.possible_values).to_json,
-              class: "cf_list_select"
-            }
-          ) %>
+      <span class="form--select-container -wide">
+        <%= hidden_field_tag("timeline[options][custom_fields][#{custom_field.id.to_s}][]",
+              timeline.custom_field_list_value(custom_field.id.to_s),
+              {
+                :"data-values" => list_to_select_object_with_none(custom_field.possible_values).to_json,
+                class: "cf_list_select"
+              }
+            ) %>
+      </span>
     <% end %>
   </div>
   <%