diff --git a/app/templates/courses/teacher-class-view.jade b/app/templates/courses/teacher-class-view.jade
index 8faf7e7a4..e6e025574 100644
--- a/app/templates/courses/teacher-class-view.jade
+++ b/app/templates/courses/teacher-class-view.jade
@@ -182,7 +182,8 @@ mixin studentsTab
         th.checkbox-col.select-all.small.text-center
           span(data-i18n="teacher.select_all")
           .checkbox-flat
-            input(type='checkbox' id='checkbox-all-students')
+            - var allStudentsChecked = _.all(state.get('checkboxStates'))
+            input(type='checkbox', id='checkbox-all-students', checked=allStudentsChecked)
             label.checkmark(for='checkbox-all-students')
         th
           +sortButtons
@@ -201,7 +202,7 @@ mixin studentRow(student)
   tr.student-row.alternating-background
     td.checkbox-col.student-checkbox
       .checkbox-flat
-        input(type='checkbox' id='checkbox-student-' + student.id, data-student-id=student.id)
+        input(type='checkbox' id='checkbox-student-' + student.id, data-student-id=student.id, checked=state.get('checkboxStates')[student.id])
         label.checkmark(for='checkbox-student-' + student.id)
     td.student-info-col
       .student-info
diff --git a/app/views/courses/TeacherClassView.coffee b/app/views/courses/TeacherClassView.coffee
index 53f3ce9ba..05318572a 100644
--- a/app/views/courses/TeacherClassView.coffee
+++ b/app/views/courses/TeacherClassView.coffee
@@ -56,6 +56,7 @@ module.exports = class TeacherClassView extends RootView
         assigningToNobody: false
         assigningToUnenrolled: false
       selectedCourse: undefined
+      checkboxStates: {}
       classStats:
         averagePlaytime: ""
         totalPlaytime: ""
@@ -145,6 +146,10 @@ module.exports = class TeacherClassView extends RootView
       classStats = @calculateClassStats()
       @state.set classStats: classStats if classStats
       @state.set students: @students
+      checkboxStates = {}
+      for student in @students.models
+        checkboxStates[student.id] = @state.get('checkboxStates')[student.id] or false
+      @state.set { checkboxStates }
     @listenTo @students, 'sort', ->
       @state.set students: @students
     @listenTo @, 'course-select:change', ({ selectedCourse }) ->
@@ -291,8 +296,7 @@ module.exports = class TeacherClassView extends RootView
     @trigger 'course-select:change', { selectedCourse: @courses.get($(e.currentTarget).val()) }
 
   getSelectedStudentIDs: ->
-    @$('.student-row .checkbox-flat input:checked').map (index, checkbox) ->
-      $(checkbox).data('student-id')
+    Object.keys(_.pick @state.get('checkboxStates'), (checked) -> checked)
 
   ensureInstance: (courseID) ->
 
@@ -304,7 +308,7 @@ module.exports = class TeacherClassView extends RootView
     window.tracker?.trackEvent $(e.currentTarget).data('event-action'), category: 'Teachers', classroomID: @classroom.id, userID: userID, ['Mixpanel']
 
   onClickBulkEnroll: ->
-    userIDs = @getSelectedStudentIDs().toArray()
+    userIDs = @getSelectedStudentIDs()
     selectedUsers = new Users(@students.get(userID) for userID in userIDs)
     @enrollStudents(selectedUsers)
     window.tracker?.trackEvent 'Teachers Class Students Enroll Selected', category: 'Teachers', classroomID: @classroom.id, ['Mixpanel']
@@ -385,10 +389,9 @@ module.exports = class TeacherClassView extends RootView
   onClickBulkAssign: ->
     courseID = @$('.bulk-course-select').val()
     selectedIDs = @getSelectedStudentIDs()
-    members = selectedIDs.filter((index, userID) =>
+    members = selectedIDs.filter (userID) =>
       user = @students.get(userID)
       user.isEnrolled()
-    ).toArray()
     assigningToUnenrolled = _.any selectedIDs, (userID) =>
       not @students.get(userID).isEnrolled()
     assigningToNobody = selectedIDs.length is 0
@@ -417,23 +420,22 @@ module.exports = class TeacherClassView extends RootView
 
   onClickSelectAll: (e) ->
     e.preventDefault()
-    checkboxes = @$('.student-checkbox input')
-    if _.all(checkboxes, 'checked')
-      @$('.select-all input').prop('checked', false)
-      checkboxes.prop('checked', false)
+    checkboxStates = _.clone @state.get('checkboxStates')
+    if _.all(checkboxStates)
+      for studentID of checkboxStates
+        checkboxStates[studentID] = false
     else
-      @$('.select-all input').prop('checked', true)
-      checkboxes.prop('checked', true)
-    null
+      for studentID of checkboxStates
+        checkboxStates[studentID] = true
+    @state.set { checkboxStates }
 
   onClickStudentCheckbox: (e) ->
     e.preventDefault()
-    # $(e.target).$()
     checkbox = $(e.currentTarget).find('input')
-    checkbox.prop('checked', not checkbox.prop('checked'))
-    # checkboxes.prop('checked', false)
-    checkboxes = @$('.student-checkbox input')
-    @$('.select-all input').prop('checked', _.all(checkboxes, 'checked'))
+    studentID = checkbox.data('student-id')
+    checkboxStates = _.clone @state.get('checkboxStates')
+    checkboxStates[studentID] = not checkboxStates[studentID]
+    @state.set { checkboxStates }
 
   calculateClassStats: ->
     return {} unless @classroom.sessions?.loaded and @students.loaded