diff --git a/src/opnsense/www/js/opnsense_theme.js b/src/opnsense/www/js/opnsense_theme.js
index dabf326e1..ddd91d7b9 100644
--- a/src/opnsense/www/js/opnsense_theme.js
+++ b/src/opnsense/www/js/opnsense_theme.js
@@ -51,8 +51,6 @@ $(document).ready(function () {
             var that = $(this);
             if (that.next('div').hasClass('in')) {
                 /* no action needed */
-            } else if ((that.next().is('a')) || (that.is('a:last-child'))) {
-                close_submenu(this);
             } else {
                 var offsetTop = that.offset().top;
                 var winscrTop = $window.scrollTop();
@@ -60,6 +58,7 @@ $(document).ready(function () {
                 var divTop = (offsetTop - winscrTop);
                 var currentHeight = (divTop + divHeight);
                 var thatTrigger = that.trigger('click');
+                close_submenu(this);
                 if (currentHeight > winHeight) {
                     var result = that.next('div').css('margin-top', -divHeight - (that.is(layer1_a) ? 3 : 0));
                 }