diff --git a/src/js/select2/core.js b/src/js/select2/core.js
index 361dd5c8..cc384b0b 100644
--- a/src/js/select2/core.js
+++ b/src/js/select2/core.js
@@ -181,6 +181,10 @@ define([
       });
     });
 
+    this.$element.on('focus.select2', function (evt) {
+      self.trigger('focus', evt);
+    });
+
     this._sync = Utils.bind(this._syncAttributes, this);
 
     if (this.$element[0].attachEvent) {
diff --git a/src/js/select2/dropdown/search.js b/src/js/select2/dropdown/search.js
index f7f802a8..3e9df401 100644
--- a/src/js/select2/dropdown/search.js
+++ b/src/js/select2/dropdown/search.js
@@ -62,6 +62,12 @@ define([
       self.$search.val('');
     });
 
+    container.on('focus', function () {
+      if (container.isOpen()) {
+        self.$search.focus();
+      }
+    });
+
     container.on('results:all', function (params) {
       if (params.query.term == null || params.query.term === '') {
         var showSearch = self.showSearch(params);
diff --git a/src/js/select2/selection/single.js b/src/js/select2/selection/single.js
index 2e2181f9..89c21dbb 100644
--- a/src/js/select2/selection/single.js
+++ b/src/js/select2/selection/single.js
@@ -54,6 +54,12 @@ define([
       // User exits the container
     });
 
+    container.on('focus', function (evt) {
+      if (!container.isOpen()) {
+        self.$selection.focus();
+      }
+    });
+
     container.on('selection:update', function (params) {
       self.update(params.data);
     });