             @selectOption e.target
 
         @dropSelect.$drop.on 'mousemove', '.drop-select-option', (e) =>
-            @dropSelect.$drop.find('.drop-select-option-highlight').removeClass('drop-select-option-highlight')
-            $(e.target).addClass('drop-select-option-highlight')
+            @setOptionHighlight e.target
 
 window.Select = Select
            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'))

            trigger: 'click'

        @dropSelect.$drop.on 'dropopen', =>
            @setOptionHighlight @getSelectedOption()[0]

    renderDrop: ->
        $dropSelectOptions = $ '<ul class="drop-select-options"></ul>'
