diff --git a/CHANGELOG b/CHANGELOG
index b12ba9f31b1dc09565aaeef798ab7d027603b361..fbbccf75112d1f39396c4f7bdccfa8940a91422c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -72,6 +72,7 @@ v 8.9.0 (unreleased)
   - Projects pending deletion will render a 404 page
   - Measure queue duration between gitlab-workhorse and Rails
   - Added Gfm autocomplete for labels
+  - Added edit note 'up' shortcut documentation to the help panel and docs screenshot #18114
   - Make Omniauth providers specs to not modify global configuration
   - Remove unused JiraIssue class and replace references with ExternalIssue. !4659 (Ilan Shamir)
   - Make authentication service for Container Registry to be compatible with < Docker 1.11
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml
index 01648047ce20ecfb9ffba7490196da0e1b35f3ac..8cc0b59edebd8c2545d4f3f2aaeefd4cb5a8c5c0 100644
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -28,8 +28,12 @@
                     .key &#8984; shift p
                   - else
                     .key ctrl shift p
-
                 %td Toggle Markdown preview
+              %tr
+                %td.shortcut
+                  .key
+                    %i.fa.fa-arrow-up
+                %td Edit last comment (when focused on an empty textarea)
             %tbody
               %tr
                 %th
diff --git a/doc/workflow/shortcuts.png b/doc/workflow/shortcuts.png
index beb6c53ec771f8aa10660e20ce4f5b7a1e16c04c..16be0413b64ac6be977d54ad78e9f23b0c5e6a13 100644
Binary files a/doc/workflow/shortcuts.png and b/doc/workflow/shortcuts.png differ