diff --git a/edx_sga/static/js/src/edx_sga.js b/edx_sga/static/js/src/edx_sga.js
index fd01a5ff..c99930a5 100644
--- a/edx_sga/static/js/src/edx_sga.js
+++ b/edx_sga/static/js/src/edx_sga.js
@@ -106,8 +106,10 @@ function StaffGradedAssignmentXBlock(runtime, element) {
                     }
                 }
             });
-
             updateChangeEvent(fileUpload);
+            if (!_.isUndefined(state.error)) {
+                $(content).find('p.error').focus();
+            }
         }
 
         function renderStaffGrading(data) {
@@ -175,10 +177,13 @@ function StaffGradedAssignmentXBlock(runtime, element) {
                 event.preventDefault();
                 if (isNaN(score)) {
                     form.find('.error').html('<br/>Grade must be a number.');
+                    form.find('.error').focus();
                 } else if (score !== parseInt(score)) {
                     form.find('.error').html('<br/>Grade must be an integer.');
+                    form.find('.error').focus();
                 } else if (score < 0) {
                     form.find('.error').html('<br/>Grade must be positive.');
+                    form.find('.error').focus();
                 } else if (score > max_score) {
                     form.find('.error').html('<br/>Maximum score is ' + max_score);
                 } else {
diff --git a/edx_sga/templates/staff_graded_assignment/show.html b/edx_sga/templates/staff_graded_assignment/show.html
index cedb78df..524dd4d7 100644
--- a/edx_sga/templates/staff_graded_assignment/show.html
+++ b/edx_sga/templates/staff_graded_assignment/show.html
@@ -29,18 +29,18 @@
     <% if (upload_allowed) { %>
     <p>
       <% if (uploaded) { %>
-        <span id="upload_lable">{% trans "Upload a different file" %}</span>
+        <span id="upload_label">{% trans "Upload a different file" %}</span>
       <% } else { %>
-        <span id="upload_lable">{% trans "Upload your assignment" %}</span>
+        <span id="upload_label">{% trans "Upload your assignment" %}</span>
       <% } %>
-      <div class="upload" aria-describedby="upload_lable" aria-live="polite">
+      <div class="upload" aria-describedby="upload_label" role="alert" aria-live="assertive">
         <input class="fileupload" type="file" name="assignment"/>
         <button>Select a file</button>
       </div>
     </p>
     <% } %>
     <% if (error) { %>
-      <p class="error"><%= error %></p>
+      <p class="error" role="alert" aria-live="assertive" tabindex="1"><%= error %></p>
     <% } %>
   </script>
 
@@ -165,7 +165,7 @@
           <input id="submission_id-input" type="hidden" name="submission_id"/>
           <div>Grade for <span id="student-name"/></div>
           <div>Grade: <input id="grade-input" name="grade"/>
-            <span class="error"></span></div>
+            <span class="error" role="alert" aria-live="assertive" tabindex="1"></span></div>
           <div>Comment: <textarea id="comment-input" name="comment" rows="4"></textarea></div>
           <div>
             <button type="submit">{% trans "Submit" %}</button>