diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
index 168ec57..7181270 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
@@ -115,6 +115,7 @@
 
     behaviors: [
       Gerrit.KeyboardShortcutBehavior,
+      Gerrit.PatchSetBehavior,
       Gerrit.RESTClientBehavior,
     ],
 
@@ -714,11 +715,10 @@
      * @return {Promise} A promise that yields a comment map object.
      */
     _loadCommentMap() {
-      const filterByRange = comment => {
-        const patchNum = comment.patch_set + '';
-        return patchNum === this._patchRange.patchNum ||
-            patchNum === this._patchRange.basePatchNum;
-      };
+      const filterByRange = comment =>
+          this.patchNumEquals(comment.patch_set, this._patchRange.patchNum) ||
+            this.patchNumEquals(comment.patch_set,
+                this._patchRange.basePatchNum);
 
       return Promise.all([
         this.$.restAPI.getDiffComments(this._changeNum),