diff --git a/awx/ui/test/e2e/objects/templates.js b/awx/ui/test/e2e/objects/templates.js
index 457ccf091d..f672f3040f 100644
--- a/awx/ui/test/e2e/objects/templates.js
+++ b/awx/ui/test/e2e/objects/templates.js
@@ -95,7 +95,8 @@ module.exports = {
                 wfjtDetails
             },
             elements: {
-                title: 'div[class^="Form-title"]'
+                title: 'div[class^="Form-title"]',
+                visualizerButton: '#workflow_job_template_workflow_visualizer_btn',
             }
         },
         editWorkflowJobTemplate: {
@@ -105,7 +106,8 @@ module.exports = {
                 permissions
             },
             elements: {
-                title: 'div[class^="Form-title"]'
+                title: 'div[class^="Form-title"]',
+                visualizerButton: '#workflow_job_template_workflow_visualizer_btn',
             }
         },
         list: {
diff --git a/awx/ui/test/e2e/tests/test-templates-list-actions.js b/awx/ui/test/e2e/tests/test-templates-list-actions.js
index ae551e7768..93cabeed34 100644
--- a/awx/ui/test/e2e/tests/test-templates-list-actions.js
+++ b/awx/ui/test/e2e/tests/test-templates-list-actions.js
@@ -102,13 +102,11 @@ module.exports = {
 
         templates.expect.element('@save').visible;
         templates.expect.element('@save').enabled;
+        client.pause(1000);
 
-        client
-            .useXpath()
-            .pause(1000)
-            .waitForElementVisible('//*[text()=" Workflow Editor"]')
-            .click('//*[text()=" Workflow Editor"]')
-            .useCss()
+        templates.section.editWorkflowJobTemplate
+            .waitForElementVisible('@visualizerButton')
+            .click('@visualizerButton')
             .waitForElementVisible('div.spinny')
             .waitForElementNotVisible('div.spinny')
             .waitForAngular();