diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index e38792d3be01f0916129254f0c97e8a1e4db619f..4c92a57ade3aa99008f00aad5286f82ea0d53f7b 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -113,8 +113,9 @@ const Dropdown = (($) => {
         return false
       }
 
-      this.focus()
-      this.setAttribute('aria-expanded', 'true')
+      $(this)
+        .trigger('focus')
+        .attr('aria-expanded', 'true')
 
       $(parent).toggleClass(ClassName.OPEN)
       $(parent).trigger($.Event(Event.SHOWN, relatedTarget))
@@ -167,7 +168,7 @@ const Dropdown = (($) => {
 
       let toggles = $.makeArray($(Selector.DATA_TOGGLE))
 
-      for (let i = 0; i < toggles.length; i++) {
+      for (let i = 0, l = toggles.length; i < l; i++) {
         let parent        = Dropdown._getParentFromElement(toggles[i])
         let relatedTarget = { relatedTarget : toggles[i] }