         @isAmending = false
 
         # Destroying the active EditorView will trigger our cleanup method.
-        @destroyActiveEditorView()
+        @destroyCommitEditor()
 
   # Public: Cleans up after the EditorView gets destroyed.
   cleanup: ->

        if @andPush
          new GitPush(@repo)
        @isAmending = false
        @destroyActiveEditorView()
        # Activate the former active pane.
        @currentPane.activate() if @currentPane.alive
        git.refresh()

      stderr: (err) => @destroyActiveEditorView()

  # Public: Destroys the active EditorView to trigger our cleanup method.
  destroyActiveEditorView: ->
    if atom.workspace.getActivePane().getItems().length > 1
      atom.workspace.destroyActivePaneItem()
    else
      atom.workspace.destroyActivePane()
    @cleanup()

  # Public: Undo the amend
  #

  #         'saved' and `destroyed` events of the underlaying text-buffer.
  showFile: ->
    atom.workspace
      .open(@filePath(), searchAllPanes: true)
      .done (textEditor) =>
        if atom.config.get('git-plus.openInPane')
          @splitPane(atom.config.get('git-plus.splitPane'), textEditor)
