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

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

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

      stderr: (err) => @destroyCommitEditor()

  destroyCommitEditor: ->
    @cleanup()
    atom.workspace.getTextEditors().some (editor) ->
      if editor.getURI().includes 'COMMIT_EDITMSG'
        editor.destroy()
        return true

  # Public: Undo the amend
  #
