diff --git a/client/app/shared/custom-dropdown/custom-dropdown.component.js b/client/app/shared/custom-dropdown/custom-dropdown.component.js
index da53e196a..26d09ff1e 100644
--- a/client/app/shared/custom-dropdown/custom-dropdown.component.js
+++ b/client/app/shared/custom-dropdown/custom-dropdown.component.js
@@ -20,9 +20,9 @@ function ComponentController() {
 
   vm.$onInit = function() {
     vm.menuRight = vm.menuRight && (vm.menuRight === 'true' || vm.menuRight === true);
-
     angular.extend(vm, {
       handleAction: handleAction,
+      isOpen: false
     });
   };
 
diff --git a/client/app/shared/custom-dropdown/custom-dropdown.html b/client/app/shared/custom-dropdown/custom-dropdown.html
index 3ecdf28a5..29e5b1ed2 100644
--- a/client/app/shared/custom-dropdown/custom-dropdown.html
+++ b/client/app/shared/custom-dropdown/custom-dropdown.html
@@ -1,10 +1,10 @@
-<span class="primary-action pull-left" uib-dropdown>
+<span class="primary-action pull-left" uib-dropdown is-open="vm.isOpen">
   <button type="button" class="btn btn-default" uib-dropdown-toggle ng-disabled="vm.config.isDisabled"
    uib-tooltip="{{vm.config.tooltipText}}"
             tooltip-append-to-body="true"
             tooltip-popup-delay="1000"
             tooltip-placement="top"
-            tooltip-enable="vm.config.tooltipText"
+            tooltip-enable="!vm.isOpen && vm.config.tooltipText"
     >
     <i class="{{vm.config.icon}}"></i>
     <span ng-if="vm.config.title">{{vm.config.title}}</span>