diff --git a/app/views/quizzes/_display_question.html.erb b/app/views/quizzes/_display_question.html.erb
index 4de371c3044..87ac5b75c66 100644
--- a/app/views/quizzes/_display_question.html.erb
+++ b/app/views/quizzes/_display_question.html.erb
@@ -27,10 +27,13 @@
 <div class="question_holder <%= "group" if in_group %>" id="<%= "question_template" unless question %>" style="<%= hidden unless question %>">
   <div style="display: block; height: 1px; overflow: hidden;">&nbsp;</div>
   <a name="question_<%= hash_get(question, :id, "blank") %>"></a>
-  <div class="display_question question <%= question_type.question_type %> <%= "marked" if assessing && @stored_params && @stored_params["question_#{hash_get(question, :id)}_marked"].present? %> <%= "correct" if correct %> <%= "incorrect" if incorrect %> <%= "unanswered" if unanswered %> <%= "partial_credit" if partial_credit %>" id="question_<%= hash_get(question, :id, "new") %>">
+  <% marked = assessing && @stored_params && @stored_params["question_#{hash_get(question, :id)}_marked"].present? %>
+  <div class="display_question question <%= question_type.question_type %> <%= "marked" if marked %> <%= "correct" if correct %> <%= "incorrect" if incorrect %> <%= "unanswered" if unanswered %> <%= "partial_credit" if partial_credit %>" id="question_<%= hash_get(question, :id, "new") %>">
     <div class="move"><%= image_tag "move.png", :class => "move_icon" %></div>
     <% if assessing && @quiz_presenter.can_go_back? %>
-      <div class="flag_question"></div>
+      <div class="flag_question" role="checkbox" aria-checked="<%= marked ? "true" : "false" %>">
+        <span class="screenreader-only"><%= t(:flag_this_question, "Flag this Question") %></span>
+      </div>
     <% end %>
     <div class="header" <%= hidden(true) if (assessing || assessment_results) && question_type && question_type.entry_type == "none" %>>
       <span class="name question_name" tabindex="0" role="heading"><%= hash_get(question, :question_name) %></span>
diff --git a/public/javascripts/take_quiz.js b/public/javascripts/take_quiz.js
index 4b290522927..9ed0097ebac 100644
--- a/public/javascripts/take_quiz.js
+++ b/public/javascripts/take_quiz.js
@@ -464,6 +464,7 @@ define([
       .delegate(".flag_question", 'click', function() {
         var $question = $(this).parents(".question");
         $question.toggleClass('marked');
+        $(this).attr("aria-checked", $question.hasClass('marked'));
         $("#list_" + $question.attr('id')).toggleClass('marked');
         quizSubmission.updateSubmission();
       })