diff --git a/app/views/admin/banners/_form.html.erb b/app/views/admin/banners/_form.html.erb
index 844d3888a..70e55079e 100644
--- a/app/views/admin/banners/_form.html.erb
+++ b/app/views/admin/banners/_form.html.erb
@@ -34,12 +34,14 @@
   </div>
 
   <div class="row">
-    <div class="small-12 column">
-      <%= f.label :sections, t("admin.banners.banner.sections_label") %>
+    <fieldset class="small-12 column">
+      <legend><%= t("admin.banners.banner.sections_label") %></legend>
       <%= f.collection_check_boxes(:web_section_ids, @banner_sections, :id, :name) do |b| %>
-        <%= b.check_box %> <%= t("admin.banners.banner.sections.#{b.text}") %><br>
+        <%= b.label do %>
+          <%= b.check_box + t("admin.banners.banner.sections.#{b.text}") %>
+        <% end %>
       <% end %>
-    </div>
+    </fieldset>
   </div>
 
   <div class="row">
diff --git a/spec/system/admin/banners_spec.rb b/spec/system/admin/banners_spec.rb
index 7bd3f0d88..1cb53816d 100644
--- a/spec/system/admin/banners_spec.rb
+++ b/spec/system/admin/banners_spec.rb
@@ -73,7 +73,7 @@ describe "Admin banners magement" do
   end
 
   scenario "Publish a banner" do
-    section = create(:web_section, name: "proposals")
+    section = WebSection.find_by(name: "proposals")
 
     visit admin_root_path
 
@@ -92,7 +92,7 @@ describe "Admin banners magement" do
     fill_in "post_ended_at", with: next_week.strftime("%d/%m/%Y")
     fill_in "banner_background_color", with: "#850000"
     fill_in "banner_font_color", with: "#ffb2b2"
-    check "banner_web_section_ids_#{section.id}"
+    check section.name.titleize
 
     click_button "Save changes"