diff --git a/src/components/post_status_form/post_status_form.scss b/src/components/post_status_form/post_status_form.scss
index a753fc38d..3de28928d 100644
--- a/src/components/post_status_form/post_status_form.scss
+++ b/src/components/post_status_form/post_status_form.scss
@@ -16,7 +16,7 @@
   .form-bottom {
     display: flex;
     justify-content: space-between;
-    padding: 0.5em;
+    padding: 0.5em 0.5em 0.25em;
     height: 2.5em;
 
     .post-button-group {
@@ -210,6 +210,13 @@
     flex-direction: column;
   }
 
+  .keyboard-enter-hint {
+    text-align: right;
+    margin-right: 1em;
+    line-height: 1;
+    margin-bottom: 0.5em;
+  }
+
   textarea.input.form-post-body {
     // TODO: make a resizable textarea component?
     box-sizing: content-box; // needed for easier computation of dynamic size
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index afc465c67..1ed73e00a 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -381,6 +381,14 @@
           </Popover>
         </div>
       </div>
+      <small class="keyboard-enter-hint faint">
+        <i v-if="submitOnEnter">
+          {{ $t('post_status.enter_submits') }}
+        </i>
+        <i v-else>
+          {{ $t('post_status.enter_newline') }}
+        </i>
+      </small>
       <div
         v-show="showDropIcon !== 'hide'"
         :style="{ animation: showDropIcon === 'show' ? 'fade-in 0.25s' : 'fade-out 0.5s' }"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index f6b3ba279..5326ecf4c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -306,6 +306,8 @@
     },
     "content_type_selection": "Post format",
     "content_warning": "Subject (optional)",
+    "enter_submits": "Enter key sends the post",
+    "enter_newline": "Enter key adds a newline",
     "default": "Just landed in L.A.",
     "direct_warning_to_all": "This post will be visible to all the mentioned users.",
     "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",