1 files changed, 7 insertions, 1 deletions
diff --git a/qa/qa/page/component/note.rb b/qa/qa/page/component/note.rb
index 5ac72d73c78..0454042289b 100644
--- a/qa/qa/page/component/note.rb
+++ b/qa/qa/page/component/note.rb
@@ -122,13 +122,17 @@ module QA
 
         def select_all_activities_filter
           select_filter_with_text('Show all activity')
+
+          wait_until do
+            has_no_element?(:discussion_filter_container) && has_element?(:comment_field)
+          end
         end
 
         def select_comments_only_filter
           select_filter_with_text('Show comments only')
 
           wait_until do
-            has_no_element?(:system_note_content)
+            has_no_element?(:discussion_filter_container) && has_no_element?(:system_note_content)
           end
         end
 
@@ -145,6 +149,8 @@ module QA
           click_element :note_dropdown
           click_element :discussion_menu_item
           click_element :comment_button
+
+          has_comment?(text)
         end
 
         def toggle_comments(position)