     </div>
 
   removeSubject: (subject) ->
+    lastSubjectOnPage = (@state.subjects.length % 20 is 1)
+
+    pageValue = @props.page
+    
+    # if the removed subject is the last subject on the page,
+    # set the page number to the previous page
+    if lastSubjectOnPage
+      pageValue = @props.page - 1
+
     @props.subjectSet.removeLink('subjects', subject.id).then =>
-      @setSubjectResources(@props.subjectSet.id, @state.page)
+      @newPage(pageValue)
       announceSetChange()
 
 EditSubjectSetPage = React.createClass

    subjectSet: {}

  getInitialState: ->
    page: 1
    pageCount: NaN
    subjects: null

  componentWillReceiveProps: (nextProps) ->
    @setSubjectResources(nextProps.subjectSet.id, "1")
      
  componentWillMount: ->
    @setSubjectResources(@props.subjectSet.id, @state.page)

  setSubjectResources: (subjetSetId, page) ->
    gettingSetMemberSubjects = apiClient.type('set_member_subjects').get

      <hr />

      This set contains {@props.subjectSet.set_member_subjects_count} subjects:<br />
      <SubjectSetListing subjectSet={@props.subjectSet} page={@state.page} newPage={@newPage} />

      <hr />

