diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index a0009141c27..8e0e64b8949 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -5,7 +5,6 @@ class @AwardsHandler
       event.preventDefault()
 
       @showEmojiMenu()
-      $("#emoji_search").focus()
 
     $("html").on 'click', (event) ->
       if !$(event.target).closest(".emoji-menu").length
@@ -18,10 +17,12 @@ class @AwardsHandler
   showEmojiMenu: ->
     if $(".emoji-menu").length
       $(".emoji-menu").show()
+      $("#emoji_search").focus()
     else
       $.get "/emoji_menu", (response) ->
         $(".add-award").after response
         $(".emoji-menu").show()
+        $("#emoji_search").focus()
 
   addAward: (emoji) ->
     emoji = @normilizeEmojiName(emoji)
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index 93cf608cc62..ff9677ba972 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -96,6 +96,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
   end
 
   step 'The search field is focused' do
+    sleep 0.8
     page.evaluate_script("document.activeElement.id").should eq "emoji_search"
   end
 end