               next_index = next_index - group.children.length
               next_question = document.flat_fields[next_index]
 
-          return if not next_question
+          if not next_question
+            @_display_form_buttons( @currentQuestionIndex, next_question )
+            return
 
           #Is this question relevant?  Or, is this question an equation?
           if (next_question.bind and next_question.bind.calculate != null) or not

              return

          # Hide the current question, show the next question
          @toggle_question(next_question, false)
          @toggle_question(current_question, true)

          @currentQuestionIndex = next_index
          #Start the Geopoint display if geopoint
          #_geopointDisplay()  if form_info.bind isnt `undefined` and form_info.bind.map isnt `undefined`

          @_display_form_buttons( @currentQuestionIndex, next_question )

          @


          @

        _display_form_buttons: ( question_index, question ) ->
          # Last question
          if question_index is @numberOfQuestions - 1 or not question
              $( '#prev_btn' ).show()
              $( '#submit_btn' ).show()
              $( '#next_btn' ).hide()

          # First question
          else if question_index is 0
              $( '#prev_btn' ).hide()
              $( '#submit_btn' ).hide()
              $( '#next_btn' ).show()

          # All other questions
          else
              $( '#prev_btn' ).show()
              $( '#next_btn' ).show()
              $( '#submit_btn' ).hide()

          # Always show submit button when editing an existing record
          $( '#submit_btn' ).show() if document.getElementById('detail_data_id') != null
          @

        passes_question_constraints: ->
            #TODO: First check constraints on the question we're on
