diff --git a/spec/system/emojis/emoji_deny_list_spec.rb b/spec/system/emojis/emoji_deny_list_spec.rb
index 36d2dcce56d..18958799abb 100644
--- a/spec/system/emojis/emoji_deny_list_spec.rb
+++ b/spec/system/emojis/emoji_deny_list_spec.rb
@@ -50,10 +50,10 @@ describe "Emoji deny list", type: :system, js: true do
       topic_page.visit_topic_and_open_composer(topic)
       expect(composer).to be_opened
 
-      composer.click_toolbar_button(10)
+      composer.click_toolbar_button("insert-emoji")
       expect(composer.emoji_picker).to be_visible
 
-      expect(emoji_picker.has_emoji?("fu")).to eq(false)
+      expect(emoji_picker).not_to have_emoji("fu")
     end
 
     it "should not show denied emojis and aliases in emoji autocomplete" do
diff --git a/spec/system/page_objects/components/composer.rb b/spec/system/page_objects/components/composer.rb
index dd6f3df4b32..be5f905fae0 100644
--- a/spec/system/page_objects/components/composer.rb
+++ b/spec/system/page_objects/components/composer.rb
@@ -15,8 +15,8 @@ module PageObjects
         self
       end
 
-      def click_toolbar_button(number)
-        find(".d-editor-button-bar button:nth-child(#{number})").click
+      def click_toolbar_button(button_class)
+        find(".d-editor-button-bar button.#{button_class}").click
         self
       end
 
diff --git a/spec/system/page_objects/components/emoji_picker.rb b/spec/system/page_objects/components/emoji_picker.rb
index 715d129ccce..6e54ab65e71 100644
--- a/spec/system/page_objects/components/emoji_picker.rb
+++ b/spec/system/page_objects/components/emoji_picker.rb
@@ -3,8 +3,12 @@
 module PageObjects
   module Components
     class EmojiPicker < PageObjects::Components::Base
+      def emoji_button_selector(emoji_name)
+        ".emoji-picker .emoji[title='#{emoji_name}']"
+      end
+
       def select_emoji(emoji_name)
-        find(".emoji-picker .emoji[title='#{emoji_name}']").click
+        find(emoji_button_selector(emoji_name)).click
       end
 
       def search_emoji(emoji_name)
@@ -12,7 +16,7 @@ module PageObjects
       end
 
       def has_emoji?(emoji_name)
-        page.has_css?(".emoji-picker .emoji[title='#{emoji_name}']")
+        page.has_css?(emoji_button_selector(emoji_name))
       end
     end
   end