diff --git a/app/assets/javascripts/notes/components/issue_comment_form.vue b/app/assets/javascripts/notes/components/issue_comment_form.vue
index ee873ba4b77fd675fbb8b663f51528e5113d71c9..42bac8338ff2afeefa0bd29dfa58c7cdcebf1cfc 100644
--- a/app/assets/javascripts/notes/components/issue_comment_form.vue
+++ b/app/assets/javascripts/notes/components/issue_comment_form.vue
@@ -28,43 +28,63 @@ export default {
     commentButtonTitle() {
       return this.noteType === 'comment' ? 'Comment' : 'Start discussion';
     },
+    isIssueOpen() {
+      return this.issueState === 'opened' || this.issueState === 'reopened';
+    },
     issueActionButtonTitle() {
       if (this.note.length) {
-        const actionText = this.issueState === 'open' ? 'close' : 'reopen';
+        const actionText = this.isIssueOpen ? 'close' : 'reopen';
 
         return this.noteType === 'comment' ? `Comment & ${actionText} issue` : `Start discussion & ${actionText} issue`;
       }
 
-      return this.issueState === 'open' ? 'Close issue' : 'Reopen issue';
+      return this.isIssueOpen ? 'Close issue' : 'Reopen issue';
     },
   },
   methods: {
-    handleSave() {
-      const data = {
-        endpoint: this.endpoint,
-        noteData: {
-          full_data: true,
-          note: {
-            noteable_type: 'Issue',
-            noteable_id: window.gl.issueData.id,
-            note: this.note,
-          }
-        },
-      };
+    handleSave(withIssueAction) {
+      if (this.note.length) {
+        const data = {
+          endpoint: this.endpoint,
+          noteData: {
+            full_data: true,
+            note: {
+              noteable_type: 'Issue',
+              noteable_id: window.gl.issueData.id,
+              note: this.note,
+            },
+          },
+        };
 
-      if (this.noteType === 'discussion') {
-        data.noteData.note.type = 'DiscussionNote';
+        if (this.noteType === 'discussion') {
+          data.noteData.note.type = 'DiscussionNote';
+        }
+
+        this.$store.dispatch('createNewNote', data)
+          .then((res) => {
+            if (res.errors) {
+              this.handleError();
+            } else {
+              this.discard();
+            }
+          })
+          .catch(this.handleError);
       }
 
-      this.$store.dispatch('createNewNote', data)
-        .then((res) => {
-          if (res.errors) {
-            return this.handleError();
-          }
+      if (withIssueAction) {
+        if (this.isIssueOpen) {
+          gl.issueData.state = 'closed';
+          this.issueState = 'closed';
+        } else {
+          gl.issueData.state = 'reopened';
+          this.issueState = 'reopened';
+        }
+        this.isIssueOpen = !this.isIssueOpen;
 
-          this.discard();
-        })
-        .catch(this.handleError);
+        // This is out of scope for the Notes Vue component.
+        // It was the shortest path to update the issue state and relevant places.
+        $('.js-btn-issue-action:visible').trigger('click');
+      }
     },
     discard() {
       this.note = '';
@@ -171,6 +191,7 @@ export default {
             </ul>
           </div>
           <a
+            @click="handleSave(true)"
             :class="{'btn-reopen': issueState === 'closed', 'btn-close': issueState === 'open'}"
             class="btn btn-nr btn-comment">
             {{issueActionButtonTitle}}
diff --git a/app/assets/javascripts/notes/components/issue_note.vue b/app/assets/javascripts/notes/components/issue_note.vue
index 9a7ad1db7bbbd55c6b0d02eeb3bf429b28c1acca..ac906e9440e208f1c72359998f9b6b27b0ce5c9f 100644
--- a/app/assets/javascripts/notes/components/issue_note.vue
+++ b/app/assets/javascripts/notes/components/issue_note.vue
@@ -59,8 +59,9 @@ export default {
     },
     formUpdateHandler(note) {
       const data = {
-        endpoint: `${this.note.path}?full_data=1`,
+        endpoint: this.note.path,
         note: {
+          full_data: true,
           target_type: 'issue',
           target_id: this.note.noteable_id,
           note,
diff --git a/app/assets/javascripts/notes/components/issue_note_awards_list.vue b/app/assets/javascripts/notes/components/issue_note_awards_list.vue
index 2fc50c05c7c6beb37510ec2130904b2ee13527f3..a6e441ac90c8798277b20d06fe5e27279be5a81d 100644
--- a/app/assets/javascripts/notes/components/issue_note_awards_list.vue
+++ b/app/assets/javascripts/notes/components/issue_note_awards_list.vue
@@ -1,8 +1,8 @@
 <script>
-import * as Emoji from '../../emoji';
 import emojiSmiling from 'icons/_emoji_slightly_smiling_face.svg';
 import emojiSmile from 'icons/_emoji_smile.svg';
 import emojiSmiley from 'icons/_emoji_smiley.svg';
+import * as Emoji from '../../emoji';
 
 export default {
   props: {
diff --git a/app/assets/javascripts/notes/services/issue_notes_service.js b/app/assets/javascripts/notes/services/issue_notes_service.js
index 52ccaa82a998f89f5830fa4a6434728ef39a2596..c8b108d8a9064cd0dfb4e4b642b954812964c056 100644
--- a/app/assets/javascripts/notes/services/issue_notes_service.js
+++ b/app/assets/javascripts/notes/services/issue_notes_service.js
@@ -18,5 +18,5 @@ export default {
   },
   createNewNote(endpoint, data) {
     return Vue.http.post(endpoint, data, { emulateJSON: true });
-  }
+  },
 };
diff --git a/app/assets/javascripts/notes/stores/issue_notes_store.js b/app/assets/javascripts/notes/stores/issue_notes_store.js
index 9914b001c250810b33641473c99f2b4ba7916578..5a9c3aaad22cdf093fea7c2f5d7a95fa56fed26e 100644
--- a/app/assets/javascripts/notes/stores/issue_notes_store.js
+++ b/app/assets/javascripts/notes/stores/issue_notes_store.js
@@ -58,7 +58,7 @@ const mutations = {
       expanded: true,
       id: discussion_id,
       individual_note: !(type === 'DiscussionNote'),
-      notes: [ note ],
+      notes: [note],
       reply_id: discussion_id,
     };
 
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index a57844f974ee2cc6012dab8322f55a4d3b8c2f1d..8509e97fbc69ddca657bd81426db7102b07a840c 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -34,8 +34,8 @@
           - unless current_user == @issue.author
             %li= link_to 'Report abuse', new_abuse_report_path(user_id: @issue.author.id, ref_url: issue_url(@issue))
           - if can_update_issue
-            %li= link_to 'Close issue', issue_path(@issue, issue: { state_event: :close }, format: 'json'), class: "btn-close #{issue_button_visibility(@issue, true)}", title: 'Close issue'
-            %li= link_to 'Reopen issue', issue_path(@issue, issue: { state_event: :reopen }, format: 'json'), class: "btn-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
+            %li= link_to 'Close issue', issue_path(@issue, issue: { state_event: :close }, format: 'json'), class: "btn-close js-btn-issue-action #{issue_button_visibility(@issue, true)}", title: 'Close issue'
+            %li= link_to 'Reopen issue', issue_path(@issue, issue: { state_event: :reopen }, format: 'json'), class: "btn-reopen js-btn-issue-action #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
           - if can_report_spam
             %li= link_to 'Submit as spam', mark_as_spam_project_issue_path(@project, @issue), method: :post, class: 'btn-spam', title: 'Submit as spam'
           - if can_update_issue || can_report_spam