diff --git a/src/Umbraco.Web.UI.Client/src/views/content/rights.html b/src/Umbraco.Web.UI.Client/src/views/content/rights.html
index f430aad342..6ceec1db51 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/rights.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/rights.html
@@ -4,10 +4,10 @@
     <div ng-show="vm.viewState === 'manageGroups'">
         <div class="umb-dialog-body" ng-cloak>
 
-            <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>    
+            <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
 
             <div class="umb-pane" ng-show="!vm.loading">
-                
+
                 <form name="permissionsForm">
 
                     <div ng-show="vm.saveError">
@@ -27,21 +27,22 @@
                     <p class="abstract" style="margin-bottom: 20px;"><localize key="defaultdialogs_permissionsHelp"></localize></p>
 
                     <div style="position: relative; display: inline-block; margin-bottom: 20px;">
-
                         <umb-button
                             type="button"
                             button-style="info"
-                            label-key="defaultdialogs_permissionsSet" 
+                            label-key="defaultdialogs_permissionsSet"
                             action="vm.groupsDropdownOpen = !vm.groupsDropdownOpen"
+                            has-popup="true"
+                            is-expanded="vm.groupsDropdownOpen === undefined ? false : vm.groupsDropdownOpen"
                             add-ellipsis="true">
                         </umb-button>
-                        
-                        <umb-dropdown ng-if="vm.groupsDropdownOpen" on-close="vm.groupsDropdownOpen = false">
+
+                        <umb-dropdown ng-if="vm.groupsDropdownOpen" on-close="vm.groupsDropdownOpen = false" deep-blur="vm.groupsDropdownOpen = !vm.groupsDropdownOpen">
                             <umb-dropdown-item ng-repeat="group in vm.availableUserGroups | filter:{selected: '!true'}">
-                                <a href="" ng-click="vm.editPermissions(group)" prevent-default>
-                                    <i class="{{group.icon}}"></i>
+                                <button type="button" ng-click="vm.editPermissions(group)">
+                                    <i class="{{group.icon}}" aria-hidden="true"></i>
                                     {{group.name}}
-                                </a>
+                                </button>
                             </umb-dropdown-item>
                         </umb-dropdown>
 
@@ -61,7 +62,7 @@
                             on-edit="vm.editPermissions(group)">
                         </umb-user-group-preview>
                     </div>
-        
+
                 </form>
 
             </div>