diff --git a/src/gui/app/directives/controls/searchableEventDropdown.js b/src/gui/app/directives/controls/searchableEventDropdown.js
index 5cefd3027..bac6a48bc 100644
--- a/src/gui/app/directives/controls/searchableEventDropdown.js
+++ b/src/gui/app/directives/controls/searchableEventDropdown.js
@@ -22,7 +22,7 @@
             update: "&"
         },
         template: `
-      <ui-select ng-model="$ctrl.selectedEvent" on-select="$ctrl.selectOption($item, $model)" theme="bootstrap">
+      <ui-select ng-model="$ctrl.selectedEvent" on-select="$ctrl.selectOption($item, $model)" theme="bootstrap" title="{{$select.selected != null ? $select.selected.name + ' ' + $select.selected.source.name : 'Select or search for an event...'}}">
         <ui-select-match placeholder="Select or search for an event... ">{{$select.selected.name}} ({{$select.selected.source.name}})</ui-select-match>
         <ui-select-choices repeat="option in $ctrl.options | eventfilter: $select.search" style="position:relative;">
           <div>
diff --git a/src/gui/app/directives/filters/filterList.js b/src/gui/app/directives/filters/filterList.js
index 0736d96c4..fb1f56bda 100644
--- a/src/gui/app/directives/filters/filterList.js
+++ b/src/gui/app/directives/filters/filterList.js
@@ -17,7 +17,8 @@
             <span>Only trigger this event when</span>
 
             <div class="text-dropdown filter-mode-dropdown" uib-dropdown uib-dropdown-toggle>
-                  <div class="noselect pointer ddtext" style="font-size: 12px;">{{$ctrl.getFilterModeDisplay()}}<span class="fb-arrow down ddtext"></span></div>
+                <a href role="button"
+                   class="noselect pointer ddtext" style="font-size: 12px;">{{$ctrl.getFilterModeDisplay()}}<span class="fb-arrow down ddtext"></span></a>
                   <ul class="dropdown-menu" style="z-index: 10000000;" uib-dropdown-menu>
 
                     <li ng-click="$ctrl.filterData.mode = 'exclusive'">
diff --git a/src/gui/app/directives/modals/events/addOrEditEventModal.js b/src/gui/app/directives/modals/events/addOrEditEventModal.js
index a5991521d..e56c35cfd 100644
--- a/src/gui/app/directives/modals/events/addOrEditEventModal.js
+++ b/src/gui/app/directives/modals/events/addOrEditEventModal.js
@@ -40,7 +40,7 @@
 
                     <div class="controls-fb-inline effect-setting-container">
                         <label class="control-fb control--checkbox">Is Enabled
-                            <input type="checkbox" ng-model="$ctrl.event.active" aria-label="..." checked>
+                            <input type="checkbox" ng-model="$ctrl.event.active" aria-label="Is Active" checked>
                             <div class="control__indicator"></div>
                         </label>
                     </div>
@@ -48,13 +48,13 @@
                 <div class="cooldown-title">
                     <div class="controls-fb-inline effect-custom-cooldown-container">
                         <label class="control-fb control--checkbox">Custom Cooldown
-                            <input type="checkbox" ng-model="$ctrl.event.customCooldown" aria-label="..." >
+                            <input type="checkbox" ng-model="$ctrl.event.customCooldown" aria-label="Use Custom Cooldown" >
                             <div class="control__indicator"></div>
                         </label>
                         <div id="cooldown-options" ng-if="$ctrl.event.customCooldown" class="nav-body-wrapper" style="padding-left: 29px;">
                             <input type="number" class="form-control event-id" aria-describedby="basic-addon3" placeholder="Enter time in seconds" ng-model="$ctrl.event.customCooldownSecs" style="margin-bottom: 6px;">
                             <label class="control-fb control--checkbox">Apply Cooldown Per User
-                                <input type="checkbox" ng-model="$ctrl.event.customCooldownPerUser" aria-label="..." >
+                                <input type="checkbox" ng-model="$ctrl.event.customCooldownPerUser" aria-label="Apply Cooldown Per User" >
                                 <div class="control__indicator"></div>
                             </label>
                         </div>
diff --git a/src/gui/js/plugins/select.js b/src/gui/js/plugins/select.js
index 1d7ba290e..97a8d198e 100644
--- a/src/gui/js/plugins/select.js
+++ b/src/gui/js/plugins/select.js
@@ -2038,6 +2038,8 @@ uis.directive('uiSelectSingle', ['$timeout','$compile', function($timeout, $comp
       scope.$watch('$select.selected', function(newValue) {
         if (ngModel.$viewValue !== newValue) {
           ngModel.$setViewValue(newValue);
+          $select.baseTitle = newValue.name || 'Select box';
+          $select.focusserTitle = $select.baseTitle + ' focus';
         }
       });