 
             # Starting to save, so show the "Saving..." notification
             if data.state == 'start'
-                @_hideEditor()
                 @savingNotification.show()
 
             # Finished saving, so hide the "Saving..." notification
             else if data.state == 'end'
+
+                # Hide the editor *after* we finish saving in case there are validation
+                # errors that the user needs to correct.
+                @_hideEditor()
+
                 $('.component.editing').removeClass('editing')
                 @savingNotification.hide()
 

        super()
        @savingNotification = new NotificationView.Mini
            title: gettext('Saving&hellip;')

      handlerUrl: (element, handlerName, suffix, query, thirdparty) ->
        uri = URI("/xblock").segment($(element).data('usage-id'))

          el.find('.component-editor').slideUp(150)
          ModalUtils.hideModalCover()

          # Hide any alerts that are being shown
          if @alert.options.shown
              @alert.hide()
