             trigger: 'click'
 
         @dropSelect.$drop.on 'dropopen', =>
-            @dropSelect.$drop.find('.drop-select-option-highlight').removeClass('drop-select-option-highlight')
-            @getSelectedOption().addClass('drop-select-option-highlight')
+            @setOptionHighlight @getSelectedOption()[0]
 
     renderDrop: ->
         $dropSelectOptions = $ '<ul class="drop-select-options"></ul>'

            else if direction is 'down'
                $newSelection = $currentSelection

        @dropSelect.$drop.find('.drop-select-option-highlight').removeClass('drop-select-option-highlight')
        $newSelection.addClass('drop-select-option-highlight')

    selectOption: (option) ->
        @$select.val($(option).data('value'))

            @selectOption e.target

        @dropSelect.$drop.on 'mousemove', '.drop-select-option', (e) =>
            @setOptionHighlight e.target

window.Select = Select