diff --git a/app/assets/javascripts/notes/components/issue_comment_form.vue b/app/assets/javascripts/notes/components/issue_comment_form.vue
index 5b2bfeb0043..65183143e5d 100644
--- a/app/assets/javascripts/notes/components/issue_comment_form.vue
+++ b/app/assets/javascripts/notes/components/issue_comment_form.vue
@@ -92,7 +92,7 @@
         'saveNote',
       ]),
       setIsSubmitButtonDisabled(note, isSubmitting) {
-         if (!_.isEmpty(note) && !isSubmitting) {
+        if (!_.isEmpty(note) && !isSubmitting) {
           this.isSubmitButtonDisabled = false;
         } else {
           this.isSubmitButtonDisabled = true;
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 e5ef071fdb8..229127db68c 100644
--- a/app/assets/javascripts/notes/components/issue_note_awards_list.vue
+++ b/app/assets/javascripts/notes/components/issue_note_awards_list.vue
@@ -153,8 +153,8 @@
     },
     created() {
       this.emojiSmiling = emojiSmiling;
-      this.emojiSmile = this.emojiSmile;
-      this.emojiSmiley = this.emojiSmiley;
+      this.emojiSmile = emojiSmile;
+      this.emojiSmiley = emojiSmiley;
     },
   };
 </script>
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index 2deef9036d3..b9460f5b534 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -168,6 +168,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
            author: project.users.first,
            description: "# Description header"
           )
+    wait_for_requests
   end
 
   step 'project "Shop" have "Tweet control" open issue' do
diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb
index 80187b83fee..f53919f4135 100644
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
@@ -163,5 +163,7 @@ module SharedNote
     page.within(".note") do
       expect(page).to have_content("+1 Awesome!")
     end
+
+    wait_for_requests
   end
 end
diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js
index bd01d823e68..2b9baa84c0a 100644
--- a/spec/javascripts/notes_spec.js
+++ b/spec/javascripts/notes_spec.js
@@ -30,7 +30,7 @@ import '~/notes';
     return escapedString;
   };
 
-  fdescribe('Notes', function() {
+  describe('Notes', function() {
     const FLASH_TYPE_ALERT = 'alert';
     var commentsTemplate = 'merge_requests/merge_request_with_comment.html.raw';
     preloadFixtures(commentsTemplate);