diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less
index e95b178fe7..2dfc7682e6 100644
--- a/awx/ui/client/legacy-styles/ansible-ui.less
+++ b/awx/ui/client/legacy-styles/ansible-ui.less
@@ -2027,6 +2027,7 @@ tr td button i {
     }
 }
 
-button.dropdown-toggle {
+button.dropdown-toggle,
+.input-group-btn {
     z-index: 1;
 }
diff --git a/awx/ui/client/src/permissions/edit/main.js b/awx/ui/client/src/permissions/edit/main.js
index 9f36428267..08e4aa2b85 100644
--- a/awx/ui/client/src/permissions/edit/main.js
+++ b/awx/ui/client/src/permissions/edit/main.js
@@ -10,7 +10,7 @@ import controller from './edit.controller';
 
 export default
     angular.module('permissionsEdit', [])
-        .controller('editController', controller)
+        .controller('permissionsEditController', controller)
         .config(['$routeProvider', function($routeProvider) {
             var url = userRoute.route;
             delete userRoute.route;
diff --git a/awx/ui/client/src/permissions/edit/team-edit.route.js b/awx/ui/client/src/permissions/edit/team-edit.route.js
index 9b3582fcdd..8122b7fcf5 100644
--- a/awx/ui/client/src/permissions/edit/team-edit.route.js
+++ b/awx/ui/client/src/permissions/edit/team-edit.route.js
@@ -10,7 +10,7 @@ export default {
     name: 'teamPermissionsEdit',
     route: '/teams/:team_id/permissions/:permission_id',
     templateUrl: templateUrl('permissions/shared/team-permissions'),
-    controller: 'editController',
+    controller: 'permissionsEditController',
     resolve: {
         features: ['FeaturesService', function(FeaturesService) {
             return FeaturesService.get();
diff --git a/awx/ui/client/src/permissions/edit/user-edit.route.js b/awx/ui/client/src/permissions/edit/user-edit.route.js
index fac38923f7..3d42d5827e 100644
--- a/awx/ui/client/src/permissions/edit/user-edit.route.js
+++ b/awx/ui/client/src/permissions/edit/user-edit.route.js
@@ -10,7 +10,7 @@ export default {
     name: 'userPermissionsEdit',
     route: '/users/:user_id/permissions/:permission_id',
     templateUrl: templateUrl('permissions/shared/user-permissions'),
-    controller: 'editController',
+    controller: 'permissionsEditController',
     resolve: {
         features: ['FeaturesService', function(FeaturesService) {
             return FeaturesService.get();