diff --git a/select2.js b/select2.js
index 0cc6aeaa..ac1e6e79 100644
--- a/select2.js
+++ b/select2.js
@@ -2166,7 +2166,7 @@ the specific language governing permissions and limitations under the Apache Lic
                 }
             });
 
-            if (this.opts.closeOnSelect){
+            if (this.highlight() == -1){
                 choices.each2(function (i, choice) {
                     if (!choice.hasClass("select2-disabled") && choice.hasClass("select2-result-selectable")) {
                         self.highlight(0);