diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js
index b7ef6e72a..3d2b65654 100644
--- a/src/definitions/modules/dropdown.js
+++ b/src/definitions/modules/dropdown.js
@@ -811,9 +811,16 @@ $.fn.dropdown = function(parameters) {
           }
         },
 
-        focusSearch: function() {
+        focusSearch: function(skipHandler) {
           if( module.is.search() && !module.is.focusedOnSearch() ) {
-            $search[0].focus();
+            if(skipHandler) {
+              $module.off('focus' + eventNamespace, selector.search);
+              $search.focus();
+              $module.on('focus'  + eventNamespace, selector.search, module.event.search.focus)
+            }
+            else {
+              $search.focus();
+            }
           }
         },
 
@@ -1076,7 +1083,7 @@ $.fn.dropdown = function(parameters) {
                   }
                   module.remove.searchTerm();
                   if(!module.is.focusedOnSearch() && !(skipRefocus == true)) {
-                    module.focusSearch();
+                    module.focusSearch(true);
                   }
                 }
                 if(!settings.useLabels) {
diff --git a/src/definitions/modules/dropdown.less b/src/definitions/modules/dropdown.less
index fbd73597d..3235aaa41 100755
--- a/src/definitions/modules/dropdown.less
+++ b/src/definitions/modules/dropdown.less
@@ -744,6 +744,7 @@ select.ui.dropdown {
   z-index: @activeItemZIndex;
 }
 
+
 /*--------------------
         Hover
 ----------------------*/