diff --git a/spec/features/work_packages/custom_actions/custom_actions_spec.rb b/spec/features/work_packages/custom_actions/custom_actions_spec.rb
index 0f70241d03c2..59b25b5c5c0f 100644
--- a/spec/features/work_packages/custom_actions/custom_actions_spec.rb
+++ b/spec/features/work_packages/custom_actions/custom_actions_spec.rb
@@ -316,15 +316,24 @@
 
     wp_page.click_custom_action('Unassign')
     wp_page.expect_attributes assignee: '-'
+    within '.work-package-details-activities-list' do
+      expect(page)
+        .to have_css('.op-user-activity .op-user-activity--user-name',
+                     text: user.name,
+                     wait: 10)
+    end
 
     wp_page.click_custom_action('Escalate')
     wp_page.expect_attributes priority: immediate_priority.name,
                               status: default_status.name,
                               assignee: '-',
                               "customField#{list_custom_field.id}" => selected_list_custom_field_options.map(&:name).join("\n")
-
-    expect(page)
-      .to have_css('.work-package-details-activities-activity-contents a.user-mention', text: other_member_user.name, wait: 10)
+    within '.work-package-details-activities-list' do
+      expect(page)
+        .to have_css('.op-user-activity a.user-mention',
+                     text: other_member_user.name,
+                     wait: 10)
+    end
 
     wp_page.click_custom_action('Close')
     wp_page.expect_attributes status: closed_status.name,
diff --git a/spec/support/pages/admin/custom_actions/form.rb b/spec/support/pages/admin/custom_actions/form.rb
index 9b5460af14f8..89d862f18c77 100644
--- a/spec/support/pages/admin/custom_actions/form.rb
+++ b/spec/support/pages/admin/custom_actions/form.rb
@@ -86,10 +86,12 @@ def set_action(name, value)
 
         def set_condition(name, value)
           Array(value).each do |val|
-            set_condition_value(name, val)
+            retry_block do
+              set_condition_value(name, val)
 
-            within '#custom-actions-form--conditions' do
-              expect_selected_option val
+              within '#custom-actions-form--conditions' do
+                expect_selected_option val
+              end
             end
           end
         end