diff --git a/plugins/chat/spec/system/transcript_spec.rb b/plugins/chat/spec/system/transcript_spec.rb
index d7c68a218e..40cffa29f3 100644
--- a/plugins/chat/spec/system/transcript_spec.rb
+++ b/plugins/chat/spec/system/transcript_spec.rb
@@ -137,7 +137,8 @@ RSpec.describe "Quoting chat message transcripts", type: :system, js: true do
         within(".d-editor-preview") { expect(page).to have_css(".chat-transcript", count: 2) }
         expect(page).to have_content("Originally sent in #{chat_channel_1.name}")
 
-        find("#reply-control .save-or-cancel .create").click
+        # find("#reply-control .save-or-cancel .create").click
+        topic_page.send_reply
 
         selector = topic_page.post_by_number_selector(2)
         expect(page).to have_css(selector)
diff --git a/spec/system/page_objects/pages/topic.rb b/spec/system/page_objects/pages/topic.rb
index aae3928c85..0d6344ed96 100644
--- a/spec/system/page_objects/pages/topic.rb
+++ b/spec/system/page_objects/pages/topic.rb
@@ -106,7 +106,9 @@ module PageObjects
       end
 
       def send_reply
-        within("#reply-control") { find(".save-or-cancel .create").click }
+        within("#reply-control") do |reply_control|
+          reply_control.find(".save-or-cancel .create").click
+        end
       end
 
       def fill_in_composer_title(title)