diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6 b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
index 4e5c4846e05..9520e6c8f8a 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
@@ -77,6 +77,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
         keys2: [SHIFT, "k"],
         keysDelimiter: PLUS,
         shortcutsDelimiter: "slash"
+      }),
+      go_to_unread_post: buildShortcut("navigation.go_to_unread_post", {
+        keys1: [SHIFT, "l"],
+        keysDelimiter: PLUS
       })
     },
     application: {
@@ -158,6 +162,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
       print: buildShortcut("actions.print", {
         keys1: [CTRL, "p"],
         keysDelimiter: PLUS
+      }),
+      defer: buildShortcut("actions.defer", {
+        keys1: [SHIFT, "u"],
+        keysDelimiter: PLUS
       })
     }
   }
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 590f9161556..11e7ca7604c 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -65,9 +65,10 @@ const bindings = {
   "shift+p": { handler: "pinUnpinTopic" },
   "shift+r": { handler: "replyToTopic" },
   "shift+s": { click: "#topic-footer-buttons button.share", anonymous: true }, // share topic
-  "shift+u": { handler: "goToUnreadPost" },
+  "shift+l": { handler: "goToUnreadPost" },
   "shift+z shift+z": { handler: "logout" },
   "shift+f11": { handler: "fullscreenComposer", global: true },
+  "shift+u": { handler: "deferTopic" },
   t: { postAction: "replyAsNewTopic" },
   u: { handler: "goBack", anonymous: true },
   "x r": {
@@ -618,5 +619,9 @@ export default {
 
   _replyToPost() {
     this.container.lookup("controller:topic").send("replyToPost");
+  },
+
+  deferTopic() {
+    this.container.lookup("controller:topic").send("deferTopic");
   }
 };
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 37277640ffa..5342441af40 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -23,6 +23,7 @@
         <li>{{{shortcuts.navigation.up_down}}}</li>
         <li>{{{shortcuts.navigation.open}}}</li>
         <li>{{{shortcuts.navigation.next_prev}}}</li>
+        <li>{{{shortcuts.navigation.go_to_unread_post}}}</li>
       </ul>
     </div>
     <div>
@@ -64,6 +65,7 @@
         <li>{{{shortcuts.actions.mark_regular}}}</li>
         <li>{{{shortcuts.actions.mark_tracking}}}</li>
         <li>{{{shortcuts.actions.mark_watching}}}</li>
+        <li>{{{shortcuts.actions.defer}}}</li>
         <li>{{{shortcuts.actions.print}}}</li>
       </ul>
     </div>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 272b6694588..414244e40c1 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2853,6 +2853,7 @@ en:
         up_down: "%{shortcut} Move selection &uarr; &darr;"
         open: "%{shortcut} Open selected topic"
         next_prev: "%{shortcut} Next/previous section"
+        go_to_unread_post: "%{shortcut} Go to the first unread post"
       application:
         title: "Application"
         create: "%{shortcut} Create a new topic"
@@ -2889,6 +2890,7 @@ en:
         mark_tracking: "%{shortcut} Track topic"
         mark_watching: "%{shortcut} Watch topic"
         print: "%{shortcut} Print topic"
+        defer: "%{shortcut} Defer topic"
 
     badges:
       earned_n_times: