diff --git a/spec/support/features/datepicker_helper.rb b/spec/support/features/datepicker_helper.rb
index e86e32a2f9..4244da3b99 100644
--- a/spec/support/features/datepicker_helper.rb
+++ b/spec/support/features/datepicker_helper.rb
@@ -42,11 +42,9 @@ module Features
     end
 
     def select_datetime_from_datepicker(datetime)
-      ## First of all select date
       select_date_from_datepicker(datetime)
-      # Then select time
-      find(".flatpickr-calendar.open .flatpickr-hour").set datetime.strftime("%H").to_s.strip
-      find(".flatpickr-calendar.open .flatpickr-minute").set datetime.strftime("%M").to_s.strip
+      fill_in "Hour", with: datetime.strftime("%H")
+      fill_in "Minute", with: datetime.strftime("%M")
     end
 
     def pick_datetime(calendar_selector, datetime_selector)
diff --git a/spec/system/admin/order_cycles/edit_spec.rb b/spec/system/admin/order_cycles/edit_spec.rb
index a5a6e8b421..47a03e87f9 100644
--- a/spec/system/admin/order_cycles/edit_spec.rb
+++ b/spec/system/admin/order_cycles/edit_spec.rb
@@ -89,12 +89,13 @@ RSpec.describe '
         expect(page).to have_content "Your order cycle has been updated."
         expect(page).to have_field "order_cycle_name", with: "OC1 name updated"
 
-        select_datetime_from "#order_cycle_orders_close_at", "2024-03-30 00:00"
+        select_datetime_from "#order_cycle_orders_close_at", "2024-03-30 01:20"
         expect(page).to have_content "You have unsaved changes"
 
         click_button "Save"
-        expect(page).to have_field "order_cycle_orders_close_at", with: "2024-03-30 00:00"
+        expect(page).not_to have_content "You have unsaved changes"
         expect(page).to have_content "Your order cycle has been updated."
+        expect(page).to have_field "order_cycle_orders_close_at", with: "2024-03-30 01:20"
       end
     end
   end