diff --git a/qa/qa/ee/page/project/analyze/analytics_dashboards/home.rb b/qa/qa/ee/page/project/analyze/analytics_dashboards/home.rb
index f8a4ec8159b3368348c1971469113e85e9230c96..2d61636c198eb0d03f0d75716a8cdf4920e21a3c 100644
--- a/qa/qa/ee/page/project/analyze/analytics_dashboards/home.rb
+++ b/qa/qa/ee/page/project/analyze/analytics_dashboards/home.rb
@@ -49,6 +49,10 @@ def click_new_dashboard_button
                 click_element('new-dashboard-button')
               end
 
+              def click_dashboard_list_item(name)
+                click_link(name)
+              end
+
               def list_item_has_errors_badge?(list_item_index:, wait: 1)
                 within_element_by_index('dashboard-list-item', list_item_index) do
                   has_element?('dashboard-errors-badge', wait: wait)
diff --git a/qa/qa/ee/page/project/analyze/visualization_setup.rb b/qa/qa/ee/page/project/analyze/visualization_setup.rb
index 66ef6e4c362f07c6063e6f20d1613648d830aafa..4d743d904cfed84839f854cf416d33bd92cd3910 100644
--- a/qa/qa/ee/page/project/analyze/visualization_setup.rb
+++ b/qa/qa/ee/page/project/analyze/visualization_setup.rb
@@ -27,18 +27,14 @@ def set_visualization_title(title)
 
             def select_visualization_type(type)
               click_element 'visualization-type-dropdown'
-              select_item type, css: 'li.gl-dropdown-item'
+              find('option', text: type).click
             end
 
-            def choose_events
-              within_element 'events-button' do
-                click_element '.btn-confirm'
-              end
-            end
-
-            def choose_all_events_compared
-              within_element 'events-all-button' do
-                click_element '.btn-confirm'
+            def choose_measure_all_events
+              within_element 'visualization-filtered-search' do
+                click_element 'filtered-search-term'
+                click_link('Measure')
+                click_link('Tracked Events Count')
               end
             end
 
diff --git a/qa/qa/specs/features/ee/browser_ui/8_monitor/product_analytics/create_custom_visualisation_spec.rb b/qa/qa/specs/features/ee/browser_ui/8_monitor/product_analytics/create_custom_visualisation_spec.rb
index 9d232af48d6f71f326257ad9d649b6509cae08c8..90a328ff13d91663ac775854c1a6cddda6adf46b 100644
--- a/qa/qa/specs/features/ee/browser_ui/8_monitor/product_analytics/create_custom_visualisation_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/8_monitor/product_analytics/create_custom_visualisation_spec.rb
@@ -54,13 +54,11 @@ module QA
         EE::Page::Project::Analyze::VisualizationSetup.perform do |visualization|
           visualization.set_visualization_title(custom_visualization_title)
           visualization.select_visualization_type(custom_visualization_type)
-          visualization.choose_events
-          visualization.choose_all_events_compared
+          visualization.choose_measure_all_events
           visualization.click_save_your_visualization
         end
 
         Page::Project::Menu.perform(&:go_to_analytics_dashboards)
-        page.driver.browser.switch_to.alert.accept
 
         EE::Page::Project::Analyze::AnalyticsDashboards::Home.perform(&:click_new_dashboard_button)
 
@@ -75,7 +73,7 @@ module QA
         Page::Project::Menu.perform(&:go_to_analytics_dashboards)
 
         EE::Page::Project::Analyze::AnalyticsDashboards::Home.perform do |analytics_dashboards|
-          analytics_dashboards.dashboards_list[2].click
+          analytics_dashboards.click_dashboard_list_item(custom_dashboard_title)
         end
 
         EE::Page::Project::Analyze::AnalyticsDashboards::Dashboard.perform do |dashboard|