diff --git a/app/controllers/admin/questions_controller.rb b/app/controllers/admin/questions_controller.rb
index b55ff496..c9b13a95 100644
--- a/app/controllers/admin/questions_controller.rb
+++ b/app/controllers/admin/questions_controller.rb
@@ -11,7 +11,7 @@ module Admin
     end
 
     def show
-      @registrations = @conference.registrations.joins(:qanswers).uniq
+      @registrations = @conference.registrations.joins(:qanswers).where(qanswers: { question: @question })
     end
 
     def new
diff --git a/app/views/admin/questions/_questions.html.haml b/app/views/admin/questions/_questions.html.haml
index 8417a0ef..1033d5b8 100644
--- a/app/views/admin/questions/_questions.html.haml
+++ b/app/views/admin/questions/_questions.html.haml
@@ -19,7 +19,7 @@
 
       %td
         .btn-group
-          = link_to 'Show', admin_conference_question_path(@conference.short_title, q), class: 'btn btn-success'
+          = link_to 'Show', admin_conference_question_path(@conference.short_title, q), class: 'btn btn-success', disabled: !@conference.questions.include?(q)
           = link_to 'Edit', edit_admin_conference_question_path(@conference.short_title, q),
                     class: 'btn btn-primary', disabled: !(can? :update, q)
           = link_to 'Delete', admin_conference_question_path(@conference.short_title, q),