diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.java
index f921fe4084..477f018107 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.java
@@ -178,11 +178,13 @@ class Header extends Composite {
     return p.toString();
   }
 
-  private void setupNav(InlineHyperlink link, int key, String help, FileInfo info) {
+  private void setupNav(InlineHyperlink link, char key, String help, FileInfo info) {
     if (info != null) {
       final String url = url(info);
       link.setTargetHistoryToken(url);
-      link.setTitle(FileInfo.getFileName(info.path()));
+      link.setTitle(PatchUtil.M.fileNameWithShortcutKey(
+          FileInfo.getFileName(info.path()),
+          Character.toString(key)));
       keys.add(new KeyCommand(0, key, help) {
         @Override
         public void onKeyPress(KeyPressEvent event) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchMessages.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchMessages.java
index 4046fecc47..822eff70cd 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchMessages.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchMessages.java
@@ -23,4 +23,5 @@ public interface PatchMessages extends Messages {
   String expandAfter(int cnt);
   String draftSaved(Date when);
   String patchSkipRegion(String lineNumber);
+  String fileNameWithShortcutKey(String file, String key);
 }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties
index 076ab5f333..fbb7d08dc7 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties
@@ -2,3 +2,4 @@ expandBefore = +{0}⇧
 expandAfter = +{0}⇩
 draftSaved = Draft saved at {0,time,short}
 patchSkipRegion = ... skipped {0} common lines ...
+fileNameWithShortcutKey = {0} (Shortcut: {1})