diff --git a/awx/ui/client/features/templates/templatesList.view.html b/awx/ui/client/features/templates/templatesList.view.html
index 2608a04177..5a00912663 100644
--- a/awx/ui/client/features/templates/templatesList.view.html
+++ b/awx/ui/client/features/templates/templatesList.view.html
@@ -19,6 +19,7 @@
                 data-toggle="dropdown"
                 aria-haspopup="true"
                 aria-expanded="false">
+                <span class="sr-only">Toggle Dropdown</span>
             </button>
             <ul class="dropdown-menu at-List-toolbarActionDropdownMenu">
                 <li>
diff --git a/awx/ui/client/lib/components/list/_index.less b/awx/ui/client/lib/components/list/_index.less
index 5e05d07c69..9154e93a5e 100644
--- a/awx/ui/client/lib/components/list/_index.less
+++ b/awx/ui/client/lib/components/list/_index.less
@@ -46,9 +46,12 @@
 }
 
 .at-List-toolbarActionDropdownMenu {
+    border-top-right-radius: 0;
+    border: 1px solid @at-gray-d7;
     float: right;
-    right: 0;
     left: auto;
+    margin: 0;
+    right: 0;
 }
 
 .at-List-container {
diff --git a/awx/ui/client/lib/theme/_global.less b/awx/ui/client/lib/theme/_global.less
index b172089c23..a06e58dfb3 100644
--- a/awx/ui/client/lib/theme/_global.less
+++ b/awx/ui/client/lib/theme/_global.less
@@ -26,6 +26,11 @@
     border: none;
     display: flex;
     margin-left: @at-space-4x;
+
+    &[aria-expanded="true"] {
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
+    }
 }
 
 .at-Button--info {
diff --git a/awx/ui/client/src/shared/list-generator/list-actions.partial.html b/awx/ui/client/src/shared/list-generator/list-actions.partial.html
index 2c937334b0..7581e3195d 100644
--- a/awx/ui/client/src/shared/list-generator/list-actions.partial.html
+++ b/awx/ui/client/src/shared/list-generator/list-actions.partial.html
@@ -35,7 +35,7 @@
                 <span  ng-bind-html="options.buttonContent" translate></span>
                 <span class="sr-only">Toggle Dropdown</span>
             </button>
-            <ul class="dropdown-menu pull-right">
+            <ul class="dropdown-menu at-List-toolbarActionDropdownMenu">
                 <li ng-repeat="option in options.options">
                     <a ui-sref="{{option.optionSref}}" ng-bind-html="option.optionContent" ng-show="{{option.ngShow}}"></a>
                 </li>
diff --git a/awx/ui/test/e2e/objects/templates.js b/awx/ui/test/e2e/objects/templates.js
index 5ab6025dd6..062d62c0ce 100644
--- a/awx/ui/test/e2e/objects/templates.js
+++ b/awx/ui/test/e2e/objects/templates.js
@@ -127,7 +127,7 @@ module.exports = {
             return this;
         },
         selectAdd (name) {
-            this.clickWhenEnabled(`#button-add`);
+            this.clickWhenEnabled('#button-add');
 
             this.api
                 .useXpath()