diff --git a/static/styles/portico.scss b/static/styles/portico.scss
index bee0ac2a6d..615676b518 100644
--- a/static/styles/portico.scss
+++ b/static/styles/portico.scss
@@ -1626,7 +1626,8 @@ input.new-organization-button {
 
 .integration-instructions .tip,
 .markdown .warn,
-.markdown .tip {
+.markdown .tip,
+.markdown .keyboard_tip {
     position: relative;
     display: block;
     background-color: hsl(210, 22%, 96%);
@@ -1637,14 +1638,16 @@ input.new-organization-button {
 }
 
 .integration-instructions .tip,
-.markdown .tip {
+.markdown .tip,
+.markdown .keyboard_tip {
     background-color: hsl(46, 63%, 95%);
     border: 1px solid hsl(46, 63%, 84%);
 }
 
 .integration-instructions .tip,
 .markdown .warn p,
-.markdown .tip p {
+.markdown .tip p,
+.markdown .keyboard_tip p {
     margin-bottom: 0;
 }
 
@@ -1656,8 +1659,16 @@ input.new-organization-button {
     font-weight: 600;
 }
 
+.markdown .keyboard_tip::before {
+    display: inline;
+    content: "\f11c   Keyboard Shortcut:  ";
+    font-family: FontAwesome, "Yantramanav", Source Sans Pro;
+    font-weight: 600;
+}
+
 .integration-instructions .tip p:first-of-type,
-.markdown .tip p:first-of-type {
+.markdown .tip p:first-of-type,
+.markdown .keyboard_tip p:first-of-type {
     display: inline;
 }
 
@@ -1665,6 +1676,7 @@ input.new-organization-button {
     margin: 20px 0;
 }
 
+.markdown ol > li > div.keyboard_tip,
 .markdown ol > li > div.tip,
 .markdown ol > li > div.warn {
     margin: 5px 25px 5px;
diff --git a/templates/zerver/help/send-a-private-message.md b/templates/zerver/help/send-a-private-message.md
index 7e08be782c..14d39367d9 100644
--- a/templates/zerver/help/send-a-private-message.md
+++ b/templates/zerver/help/send-a-private-message.md
@@ -42,13 +42,9 @@ Once you have the user card displayed, select the **Send private message**
 option from the actions dropdown.  This will open the compose box with the
 target user as the recipient.
 
-### Use a keyboard shortcut
-
-You can open a compose box with the addressee autopopulated if you press `R`
-while a message is highlighted, but the compose box is not open. You can close
-the compose box by pressing `Esc` or by clicking the x (<i class="icon-vector-
-remove"></i>) icon located at the top right corner of the compose box. Look
-[here](/help/keyboard-shortcuts) for more keyboard shortcuts.
+!!! keyboard_tip ""
+    You can open a compose box with the addressee autopopulated if you press `R`
+    while a message is highlighted, but the compose box is not open.
 
 ## View your private message history with a user and compose
 
@@ -85,4 +81,7 @@ key or clicking the **Send** button, depending on your settings.
 
 You can always cancel your message by clicking the x (<i
 class="icon-vector-remove"></i>) icon located at the top right corner of
-your compose box or pressing the `Esc` key.
+your compose box
+
+!!! keyboard_tip ""
+    You can close the compose box by pressing the `Esc` key.