diff --git a/app/views/comments/_flag_as_inappropiate_actions.html.erb b/app/views/comments/_flag_as_inappropiate_actions.html.erb
index 07440f600..9fba8b5b2 100644
--- a/app/views/comments/_flag_as_inappropiate_actions.html.erb
+++ b/app/views/comments/_flag_as_inappropiate_actions.html.erb
@@ -1,23 +1,23 @@
 <% if can? :flag_as_inappropiate, comment %>
   <span class="divider">&nbsp;|&nbsp;</span>
-  <a data-dropdown="drop-comment-flag-<%= comment.id %>" aria-controls="drop-comment-flag-<%= comment.id %>" aria-expanded="false" title="<%= t('shared.flag_as_inappropiate') %>">
+  <a id="flag-expand-comment-<%= comment.id %>" data-dropdown="flag-drop-comment-<%= comment.id %>" aria-controls="flag-drop-comment-<%= comment.id %>" aria-expanded="false" title="<%= t('shared.flag_as_inappropiate') %>">
     &nbsp;<i class="icon-flag flag-disable"></i>&nbsp;&nbsp;
   </a>
-  <ul id="drop-comment-flag-<%= comment.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
+  <ul id="flag-drop-comment-<%= comment.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
     <li>
-    <%= link_to t("shared.flag_as_inappropiate"), flag_as_inappropiate_comment_path(comment), method: :put, remote: true, title: t("shared.flag_as_inappropiate") %>
+      <%= link_to t("shared.flag_as_inappropiate"), flag_as_inappropiate_comment_path(comment), method: :put, remote: true, id: "flag-comment-#{comment.id}" %>
     </li>
   </ul>
 <% end %>
 
 <% if can? :undo_flag_as_inappropiate, comment %>
   <span class="divider">&nbsp;|&nbsp;</span>
-  <a data-dropdown="drop-comment-unflag-<%= comment.id %>" aria-controls="drop-comment-unflag-<%= comment.id %>" aria-expanded="false" title="<%= t('shared.undo_flag_as_inappropiate') %>">
+  <a id="unflag-expand-comment-<%= comment.id %>" data-dropdown="unflag-drop-comment-<%= comment.id %>" aria-controls="unflag-drop-comment-<%= comment.id %>" aria-expanded="false" title="<%= t('shared.undo_flag_as_inappropiate') %>">
     &nbsp;<i class="icon-flag flag-active"></i>&nbsp;&nbsp;
   </a>
-  <ul id="drop-comment-unflag-<%= comment.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
+  <ul id="unflag-drop-comment-<%= comment.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
     <li>
-    <%= link_to t("shared.undo_flag_as_inappropiate"), undo_flag_as_inappropiate_comment_path(comment), method: :put, remote: true, title: t("shared.undo_flag_as_inappropiate") %>
+      <%= link_to t("shared.undo_flag_as_inappropiate"), undo_flag_as_inappropiate_comment_path(comment), method: :put, remote: true, id: "unflag-comment-#{comment.id}" %>
     </li>
   </ul>
 <% end %>
diff --git a/app/views/debates/_flag_as_inappropiate_actions.html.erb b/app/views/debates/_flag_as_inappropiate_actions.html.erb
index 6db9bc5f4..6c3d34236 100644
--- a/app/views/debates/_flag_as_inappropiate_actions.html.erb
+++ b/app/views/debates/_flag_as_inappropiate_actions.html.erb
@@ -1,21 +1,21 @@
 <% if can? :flag_as_inappropiate, debate %>
-  <a data-dropdown="drop-debate-flag-<%= debate.id %>" aria-controls="drop-debate-flag-<%= debate.id %>" aria-expanded="false" title="<%= t('shared.flag_as_inappropiate') %>">
+  <a id="flag-expand-debate-<%= debate.id %>" data-dropdown="flag-drop-debate-<%= debate.id %>" aria-controls="flag-drop-debate-<%= debate.id %>" aria-expanded="false" title="<%= t('shared.flag_as_inappropiate') %>">
     &nbsp;<i class="icon-flag flag-disable"></i>&nbsp;&nbsp;
   </a>
-  <ul id="drop-debate-flag-<%= debate.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
+  <ul id="flag-drop-debate-<%= debate.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
     <li>
-    <%= link_to t('shared.flag_as_inappropiate'), flag_as_inappropiate_debate_path(debate), method: :put, remote: true %>
+      <%= link_to t('shared.flag_as_inappropiate'), flag_as_inappropiate_debate_path(debate), method: :put, remote: true, id: "flag-debate-#{ debate.id }" %>
     </li>
   </ul>
 <% end %>
 
 <% if can? :undo_flag_as_inappropiate, debate %>
-  <a data-dropdown="drop-debate-unflag-<%= debate.id %>" aria-controls="drop-debate-unflag-<%= debate.id %>" aria-expanded="false" title="<%= t('shared.undo_flag_as_inappropiate') %>">
+  <a id="unflag-expand-debate-<%= debate.id %>" data-dropdown="unflag-drop-debate-<%= debate.id %>" aria-controls="unflag-drop-debate-<%= debate.id %>" aria-expanded="false" title="<%= t('shared.undo_flag_as_inappropiate') %>">
     &nbsp;<i class="icon-flag flag-active"></i>&nbsp;&nbsp;
   </a>
-  <ul id="drop-debate-unflag-<%= debate.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
+  <ul id="unflag-drop-debate-<%= debate.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
     <li>
-    <%= link_to t('shared.undo_flag_as_inappropiate'), undo_flag_as_inappropiate_debate_path(debate), method: :put, remote: true %>
+      <%= link_to t('shared.undo_flag_as_inappropiate'), undo_flag_as_inappropiate_debate_path(debate), method: :put, remote: true, id: "unflag-debate-#{ debate.id }" %>
     </li>
   </ul>
 <% end %>
diff --git a/spec/features/comments_spec.rb b/spec/features/comments_spec.rb
index b1b09a777..58626b02b 100644
--- a/spec/features/comments_spec.rb
+++ b/spec/features/comments_spec.rb
@@ -142,9 +142,10 @@ feature 'Comments' do
     visit debate_path(debate)
 
     within "#comment_#{comment.id}" do
-      expect(page).to_not have_link "Undo flag as inappropriate"
-      click_on 'Flag as inappropriate'
-      expect(page).to have_link "Undo flag as inappropriate"
+      page.find("#flag-expand-comment-#{comment.id}").click
+      page.find("#flag-comment-#{comment.id}").click
+
+      expect(page).to have_css("#unflag-expand-comment-#{comment.id}")
     end
 
     expect(InappropiateFlag.flagged?(user, comment)).to be
@@ -160,9 +161,10 @@ feature 'Comments' do
     visit debate_path(debate)
 
     within "#comment_#{comment.id}" do
-      expect(page).to_not have_link("Flag as inappropriate", exact: true)
-      click_on 'Undo flag as inappropiate'
-      expect(page).to have_link("Flag as inappropriate", exact: true)
+      page.find("#unflag-expand-comment-#{comment.id}").click
+      page.find("#unflag-comment-#{comment.id}").click
+
+      expect(page).to have_css("#flag-expand-comment-#{comment.id}")
     end
 
     expect(InappropiateFlag.flagged?(user, comment)).to_not be
@@ -286,4 +288,4 @@ feature 'Comments' do
     end
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index c685725d8..22b689308 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -323,9 +323,10 @@ feature 'Debates' do
     visit debate_path(debate)
 
     within "#debate_#{debate.id}" do
-      expect(page).to_not have_link "Undo flag as inappropiate"
-      click_on 'Flag as inappropiate'
-      expect(page).to have_link "Undo flag as inappropiate"
+      page.find("#flag-expand-debate-#{debate.id}").click
+      page.find("#flag-debate-#{debate.id}").click
+
+      expect(page).to have_css("#unflag-expand-debate-#{debate.id}")
     end
 
     expect(InappropiateFlag.flagged?(user, debate)).to be
@@ -340,9 +341,10 @@ feature 'Debates' do
     visit debate_path(debate)
 
     within "#debate_#{debate.id}" do
-      expect(page).to_not have_link("Flag as inappropiate", exact: true)
-      click_on 'Undo flag as inappropiate'
-      expect(page).to have_link("Flag as inappropiate", exact: true)
+      page.find("#unflag-expand-debate-#{debate.id}").click
+      page.find("#unflag-debate-#{debate.id}").click
+
+      expect(page).to have_css("#flag-expand-debate-#{debate.id}")
     end
 
     expect(InappropiateFlag.flagged?(user, debate)).to_not be