diff --git a/app/models/poll.rb b/app/models/poll.rb
index 756c01eec..f01960bd6 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -39,6 +39,7 @@ class Poll < ActiveRecord::Base
   scope :overlaping_with, lambda { |poll| 
     where('? < ends_at and ? >= starts_at', poll.starts_at.beginning_of_day, poll.ends_at.end_of_day)
       .where.not(id: poll.id)
+      .where(related: poll.related)
   }
 
   scope :sort_for_list, -> { order(:geozone_restricted, :starts_at, :name) }
diff --git a/app/views/dashboard/polls/_poll.html.erb b/app/views/dashboard/polls/_poll.html.erb
index 3c6ff0b44..f437428ac 100644
--- a/app/views/dashboard/polls/_poll.html.erb
+++ b/app/views/dashboard/polls/_poll.html.erb
@@ -19,11 +19,9 @@
 
     <div class="card-section text-center">
       <% if poll.incoming? %>
-        <%= link_to 'Editar encuesta', edit_proposal_dashboard_poll_path(proposal, poll), class: 'button hollow' %>
+        <%= link_to t('.edit_poll'), edit_proposal_dashboard_poll_path(proposal, poll), class: 'button hollow' %>
       <% else %>
-        <a href='#' class="button">
-          <%= t('.view_responses') %>
-        </a>
+        <%= link_to t('.view_responses'), proposal_dashboard_poll_path(proposal, poll), class: 'button' %>
       <% end %>
     </div>
     <div class="card-section">
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index fadb75182..519a9981a 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -577,6 +577,7 @@ en:
           one: "%{count} response"
           other: "%{count} responses"
         view_responses: View responses
+        edit_poll: Edit survey
         show_results: Show results
         show_results_help: If you check this box the results will be public and all users will be able to see them
       form:
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index 91a461d55..e4823db03 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -577,6 +577,7 @@ es:
           one: "%{count} respuesta"
           other: "%{count} respuestas"
         view_responses: Ver respuestas
+        edit_poll: Editar encuesta
         show_results: Mostrar resultados
         show_results_help: Si marcas esta casilla los resultados serán públicos y todos los usuarios podrán verlos
       form: