diff --git a/app/assets/javascripts/notes/components/issue_comment_form.vue b/app/assets/javascripts/notes/components/issue_comment_form.vue
index b53343b636e..6eb39d0e64d 100644
--- a/app/assets/javascripts/notes/components/issue_comment_form.vue
+++ b/app/assets/javascripts/notes/components/issue_comment_form.vue
@@ -169,6 +169,7 @@ export default {
               :addSpacingClasses="false">
               <textarea
                 id="note-body"
+                name="note[note]"
                 class="note-textarea js-gfm-input js-autosize markdown-area"
                 data-supports-slash-commands="true"
                 data-supports-quick-actions="true"
diff --git a/app/assets/javascripts/notes/components/issue_note_form.vue b/app/assets/javascripts/notes/components/issue_note_form.vue
index b60141eacf6..78ed88a579a 100644
--- a/app/assets/javascripts/notes/components/issue_note_form.vue
+++ b/app/assets/javascripts/notes/components/issue_note_form.vue
@@ -106,6 +106,7 @@ export default {
         :addSpacingClasses="false">
         <textarea
           id="note-body"
+          name="note[note]"
           class="note-textarea js-gfm-input js-autosize markdown-area js-note-text"
           data-supports-slash-commands="true"
           data-supports-quick-actions="true"
diff --git a/app/assets/javascripts/notes/stores/issue_notes_utils.js b/app/assets/javascripts/notes/stores/issue_notes_utils.js
index 49e19ede572..eac80c9f9c2 100644
--- a/app/assets/javascripts/notes/stores/issue_notes_utils.js
+++ b/app/assets/javascripts/notes/stores/issue_notes_utils.js
@@ -8,7 +8,7 @@ export default {
   },
   getQuickActionText(note) {
     let text = 'Applying command';
-    const quickActions = AjaxCache.get(gl.GfmAutoComplete.dataSources.commands);
+    const quickActions = AjaxCache.get(gl.GfmAutoComplete.dataSources.commands) || [];
 
     const executedCommands = quickActions.filter((command) => {
       const commandRegex = new RegExp(`/${command.name}`);
diff --git a/spec/support/quick_actions_helpers.rb b/spec/support/quick_actions_helpers.rb
index d2aaae7518f..fc8243429f5 100644
--- a/spec/support/quick_actions_helpers.rb
+++ b/spec/support/quick_actions_helpers.rb
@@ -2,7 +2,7 @@ module QuickActionsHelpers
   def write_note(text)
     Sidekiq::Testing.fake! do
       page.within('.js-main-target-form') do
-        fill_in 'note[note]', with: text
+        fill_in 'note-body', with: text
         find('.js-comment-submit-button').trigger('click')
       end
     end