diff --git a/spec/support/tom_select_helper.rb b/spec/support/tom_select_helper.rb
index d6faed8eb5..64fd870426 100644
--- a/spec/support/tom_select_helper.rb
+++ b/spec/support/tom_select_helper.rb
@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 module TomSelectHelper
-  def tomselect_open(field_name)
-    page.find("##{field_name}-ts-control").click
-  end
-
   def tomselect_multiselect(value, options)
     tomselect_wrapper = page.find_field(options[:from]).sibling(".ts-wrapper")
     tomselect_wrapper.find(".ts-control").click
diff --git a/spec/system/admin/orders_spec.rb b/spec/system/admin/orders_spec.rb
index e5bcbcc776..68e5c1c489 100644
--- a/spec/system/admin/orders_spec.rb
+++ b/spec/system/admin/orders_spec.rb
@@ -100,10 +100,10 @@ RSpec.describe '
       end
 
       it "order cycles appear in descending order by close date on orders page" do
-        tomselect_open('q_order_cycle_id_in').click
-
-        expect(find('#q_order_cycle_id_in',
-                    visible: :all)[:innerHTML]).to have_content(/.*Four.*Three.*Two.*Five/m)
+        open_tomselect_to_validate!(page, 'q_order_cycle_id_in') do
+          oc_html = find('#q_order_cycle_id_in', visible: :all)[:innerHTML]
+          expect(oc_html).to have_content(/.*Four.*Three.*Two.*Five/m)
+        end
       end
 
       it "filter by multiple order cycles" do