diff --git a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts
index 8172f41..ae635eb 100644
--- a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts
+++ b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts
@@ -227,16 +227,8 @@
   }
 
   _viewEditInChangeView() {
-    const patch = this._successfulSave
-      ? (EditPatchSetNum as PatchSetNum)
-      : this._patchNum;
-    if (this._change && patch)
-      GerritNav.navigateToChange(
-        this._change,
-        patch,
-        undefined,
-        patch !== EditPatchSetNum
-      );
+    if (this._change)
+      GerritNav.navigateToChange(this._change, undefined, undefined, true);
   }
 
   _getFileData(
diff --git a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.js b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.js
index a29d45d..8ae9827 100644
--- a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.js
+++ b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.js
@@ -317,19 +317,14 @@
     element._showAlert('test message');
   });
 
-  test('_viewEditInChangeView respects _patchNum', () => {
+  test('_viewEditInChangeView', () => {
     element._change = {};
     navigateStub.restore();
     const navStub = sinon.stub(GerritNav, 'navigateToChange');
     element._patchNum = EditPatchSetNum;
     element._viewEditInChangeView();
-    assert.equal(navStub.lastCall.args[1], EditPatchSetNum);
-    element._patchNum = '1';
-    element._viewEditInChangeView();
-    assert.equal(navStub.lastCall.args[1], '1');
-    element._successfulSave = true;
-    element._viewEditInChangeView();
-    assert.equal(navStub.lastCall.args[1], EditPatchSetNum);
+    assert.equal(navStub.lastCall.args[1], undefined);
+    assert.equal(navStub.lastCall.args[3], true);
   });
 
   suite('keyboard shortcuts', () => {