diff --git a/app/assets/javascripts/select2_customization.js b/app/assets/javascripts/select2_customization.js
index 2605e7f59..4ce47deca 100644
--- a/app/assets/javascripts/select2_customization.js
+++ b/app/assets/javascripts/select2_customization.js
@@ -145,12 +145,15 @@ $.fn.extend({
 
     $('.select2').find('input, .select2-selection__rendered').off('keydown').on('keydown', function(e) {
       var activeElement = $('.select2-results .arrow_pointer');
+      var firstElement = $('.select2-results .select2-results__option').first();
       var groupElement = activeElement.find('.select2-results__group');
       if (e.keyCode === 13) {
         if (groupElement.length > 0) {
           groupElement.click();
-        } else {
+        } else if (activeElement.length > 0) {
           activeElement.mouseup();
+        } else {
+          firstElement.mouseup();
         }
 
         setTimeout(() => {