diff --git a/app/controllers/emojis_controller.rb b/app/controllers/emojis_controller.rb
index 693e2cc48229cc7f407874060ef21210a7184df3..1bec5a7d27fffa82ec172648727576a54fbbc45f 100644
--- a/app/controllers/emojis_controller.rb
+++ b/app/controllers/emojis_controller.rb
@@ -1,5 +1,6 @@
 class EmojisController < ApplicationController
+  layout false
+
   def index
-    render :index, layout: false
   end
 end
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index ff9677ba972fcf89cf10bcc1603c2ae936484df1..277c63914d12faee79b6e918c2142e4301873440 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -96,7 +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"
+    expect(page).to have_selector('#emoji_search')
+    expect(page.evaluate_script('document.activeElement.id')).to eq('emoji_search')
   end
 end