diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
index e4eea519f5..3ac3a578ae 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
@@ -434,8 +434,8 @@ limitations under the License.
             shown-file-count="[[_shownFileCount]]"
             diff-prefs="[[_diffPrefs]]"
             diff-view-mode="{{viewState.diffMode}}"
-            patch-num="{{_patchNum}}"
-            base-patch-num="{{_basePatchNum}}"
+            patch-num="{{_patchRange.patchNum}}"
+            base-patch-num="{{_patchRange.basePatchNum}}"
             revisions="[[_sortedRevisions]]"
             on-open-diff-prefs="_handleOpenDiffPrefs"
             on-open-download-dialog="_handleOpenDownloadDialog"
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
index e143cc1f15..13dbe12bf0 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
@@ -221,7 +221,6 @@
       '_labelsChanged(_change.labels.*)',
       '_paramsAndChangeChanged(params, _change)',
       '_updateSortedRevisions(_change.revisions.*)',
-      '_patchRangeChanged(_patchRange.*)',
     ],
 
     keyBindings: {
@@ -322,15 +321,6 @@
       window.location.reload();
     },
 
-    /**
-     * Called when the patch range changes. does not detect sub property
-     * updates.
-     */
-    _patchRangeChanged() {
-      this._basePatchNum = this._patchRange.basePatchNum;
-      this._patchNum = this._patchRange.patchNum;
-    },
-
     _handleCommitMessageCancel(e) {
       this._editingCommitMessage = false;
     },
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
index ec32991dba..15d5668fa5 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
@@ -790,9 +790,8 @@ limitations under the License.
         status: 'NEW',
         labels: {},
       };
-      element._basePatchNum = 1;
-      element._patchNum = 2;
-      element._patchNum = 3;
+      element._patchRange = {basePatchNum: 1, patchNum: 2};
+      element.$.fileListHeader.patchNum = 3;
       assert.equal(navigateToChangeStub.callCount, 1);
       assert.isTrue(navigateToChangeStub.lastCall
           .calledWithExactly(element._change, 3, 1));