diff --git a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.js b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.js
index 06a2a27357..4ad35fcd2f 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.js
@@ -653,10 +653,10 @@
             }
             this.filesWeblinks = {
               meta_a: Gerrit.Nav.getFileWebLinks(
-                  this.projectName, this.commitRange.commit, this.path,
+                  this.projectName, this.commitRange.baseCommit, this.path,
                   {weblinks: diff && diff.meta_a && diff.meta_a.web_links}),
               meta_b: Gerrit.Nav.getFileWebLinks(
-                  this.projectName, this.commitRange.baseCommit, this.path,
+                  this.projectName, this.commitRange.commit, this.path,
                   {weblinks: diff && diff.meta_b && diff.meta_b.web_links}),
             };
             return diff;
diff --git a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.html b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.html
index b575258677..5b3670b582 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.html
@@ -191,12 +191,30 @@ limitations under the License.
 
       test('loads files weblinks', () => {
         const weblinksStub = sandbox.stub(Gerrit.Nav, '_generateWeblinks')
-            .returns([{name: 'stubb', url: '#s'}]);
+        .returns({name: 'stubb', url: '#s'});
         sandbox.stub(element.$.restAPI, 'getDiff').returns(Promise.resolve({}));
-        element.commitRange = {};
+        element.projectName = 'test-project';
+        element.path = 'test-path';
+        element.commitRange = {baseCommit: 'test-base', commit: 'test-commit'};
         element.patchRange = {};
         return element._getDiff().then(() => {
-          assert.isTrue(weblinksStub.called);
+          assert.isTrue(weblinksStub.calledTwice);
+          assert.isTrue(weblinksStub.firstCall.calledWith({
+            commit: 'test-base',
+            file: 'test-path',
+            options: {
+              weblinks: undefined,
+            },
+            repo: 'test-project',
+            type: Gerrit.Nav.WeblinkType.FILE}));
+          assert.isTrue(weblinksStub.secondCall.calledWith({
+            commit: 'test-commit',
+            file: 'test-path',
+            options: {
+              weblinks: undefined,
+            },
+            repo: 'test-project',
+            type: Gerrit.Nav.WeblinkType.FILE}));
           assert.deepEqual(element.filesWeblinks, {
             meta_a: [{name: 'stubb', url: '#s'}],
             meta_b: [{name: 'stubb', url: '#s'}],