diff --git a/app/views/dashboard/polls/_form.html.erb b/app/views/dashboard/polls/_form.html.erb
index 0b856dd71..da0ab6e32 100644
--- a/app/views/dashboard/polls/_form.html.erb
+++ b/app/views/dashboard/polls/_form.html.erb
@@ -30,10 +30,13 @@
       <%= render 'question_fields', f: question %>
     <% end %>
 
-    <div id="links" class="row expanded">
+    <div id="question-links" class="links row expanded">
       <div class="small-12 column">
         <%= link_to_add_association t("dashboard.polls.form.add_question"),
-                                    f, :questions, class: "button" %>
+                                    f, :questions, class: "button",
+                                    data: {
+                                      association_insertion_node: "#question-links"
+                                    } %>
       </div>
     </div>
   </div>
diff --git a/app/views/dashboard/polls/_question_answer_fields.html.erb b/app/views/dashboard/polls/_question_answer_fields.html.erb
index e7bbce656..ff41fb479 100644
--- a/app/views/dashboard/polls/_question_answer_fields.html.erb
+++ b/app/views/dashboard/polls/_question_answer_fields.html.erb
@@ -1,4 +1,4 @@
-<div class="small-12 medium-6 column">
+<div class="nested-fields small-12 medium-6 column">
   <div class="answer-fields">
     <%= f.hidden_field :given_order %>
     <div class="row expanded">
diff --git a/app/views/dashboard/polls/_question_fields.html.erb b/app/views/dashboard/polls/_question_fields.html.erb
index 50d752185..671bfa50e 100644
--- a/app/views/dashboard/polls/_question_fields.html.erb
+++ b/app/views/dashboard/polls/_question_fields.html.erb
@@ -1,4 +1,4 @@
-<div class="question-fields">
+<div class="question-fields nested-fields">
   <%= f.hidden_field :author_id, value: f.object.author_id || current_user.id %>
   <%= f.hidden_field :proposal_id, value: f.object.proposal_id || proposal.id %>
   <div class="row expanded">
@@ -17,10 +17,13 @@
       <%= render 'question_answer_fields', f: answer %>
     <% end %>
 
-    <div id="links" class="row expanded">
+    <div id="answer-links" class="links row expanded">
       <div class="small-12 column">
         <%= link_to_add_association t("dashboard.polls.question_fields.add_answer"),
-                                    f, :question_answers, class: "button hollow" %>
+                                    f, :question_answers, class: "button hollow",
+                                    data: {
+                                      association_insertion_node: "#answer-links"
+                                    } %>
       </div>
     </div>
   </div>