diff --git a/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java b/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java
index e028626dffb2..e31d0cd02c71 100644
--- a/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java
+++ b/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java
@@ -76,7 +76,7 @@ public class GitInteractiveRebaseEditorHandler implements Closeable, GitRebaseEd
     try {
       if (myRebaseEditorShown) {
         myEditorCancelled = !handleUnstructuredEditor(path);
-        return 0;
+        return myEditorCancelled ? ERROR_EXIT_CODE : 0;
       }
       else {
         setRebaseEditorShown();