diff --git a/src/sunstone/public/app/app.js b/src/sunstone/public/app/app.js
index 2bda541c8f..52671d6ddb 100644
--- a/src/sunstone/public/app/app.js
+++ b/src/sunstone/public/app/app.js
@@ -66,6 +66,7 @@ define(function(require) {
     Sunstone.insertTabs();
 
     _setupAccordion();
+    _setupCloseDropdownsOnClick();
     _insertUserAndZoneSelector();
 
     if (Config.isTabEnabled(PROVISION_TAB_ID)) {
@@ -77,6 +78,13 @@ define(function(require) {
     }
   });
 
+  function _setupCloseDropdownsOnClick() {
+    $(document).on("click", '[data-dropdown-content] a', function() {
+      var id = $(this).closest('ul').attr('id');
+      $('[data-dropdown=' + id + ']').trigger('click');
+    });
+  }
+
   function _setupAccordion() {
     $(document).on("click", ".accordion_advanced > a", function() {
       if ($(this).hasClass("active")) {