diff --git a/app/assets/javascripts/discourse/components/keyboard_shortcuts_component.js b/app/assets/javascripts/discourse/components/keyboard_shortcuts_component.js
index e0264e02d..789538f04 100644
--- a/app/assets/javascripts/discourse/components/keyboard_shortcuts_component.js
+++ b/app/assets/javascripts/discourse/components/keyboard_shortcuts_component.js
@@ -32,10 +32,10 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({
     'm w': 'div.notification-options li[data-id="3"] a',          // mark topic as watching
     'n': '#user-notifications',                                   // open notifictions menu
     'o,enter': '#topic-list tr.topic-list-item.selected a.title', // open selected topic
-    'r': '#topic-footer-buttons button.create',                   // reply to topic
-    'R': '.topic-post.selected button.create',                        // reply to selected post
-    's': '#topic-footer-buttons button.share',                    // share topic
-    'S': '.topic-post.selected button.share',                         // share selected post
+    'shift+r': '#topic-footer-buttons button.create',                   // reply to topic
+    'r': '.topic-post.selected button.create',                        // reply to selected post
+    'shift+s': '#topic-footer-buttons button.share',                    // share topic
+    's': '.topic-post.selected button.share',                         // share selected post
     '!': '.topic-post.selected button.flag'                           // flag selected post
   },
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e3caffc41..83b0cd0ea 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1829,10 +1829,10 @@ en:
       actions:
         title: 'Actions'
         star: '<b>f</b> Star topic'
-        share_topic: '<b>s</b> Share topic'
-        share_post: '<b>shift s</b> Share post'
-        reply_topic: '<b>r</b> Reply to topic'
-        reply_post: '<b>shift r</b> Reply to post'
+        share_topic: '<b>shift s</b> Share topic'
+        share_post: '<b>s</b> Share post'
+        reply_topic: '<b>shift r</b> Reply to topic'
+        reply_post: '<b>r</b> Reply to post'
         like: '<b>l</b> Like post'
         flag: '<b>!</b> Flag post'
         bookmark: '<b>b</b> Bookmark post'
diff --git a/test/javascripts/components/keyboard_shortcuts_component_test.js b/test/javascripts/components/keyboard_shortcuts_component_test.js
index 749a6210c..5d9efbbdb 100644
--- a/test/javascripts/components/keyboard_shortcuts_component_test.js
+++ b/test/javascripts/components/keyboard_shortcuts_component_test.js
@@ -24,7 +24,7 @@ module("Discourse.KeyboardShortcuts", {
     sinon.stub(Discourse.URL, "routeTo");
 
     $("#qunit-fixture").html([
-      "<article class='selected'>",
+      "<article class='topic-post selected'>",
       "  <button class='bookmark'></button>",
       "  <button class='delete'></button>",
       "  <button class='edit'></button>",