             else if (dataProvider)
             {
                 // Normalize the proposed index for getNavigationDestinationIndex
-                currentIndex = selectedIndex < NO_SELECTION ? NO_SELECTION : selectedIndex;
+                currentIndex = caretIndex < NO_SELECTION ? NO_SELECTION : caretIndex;
                 
                 // FIXME (jszeto) : SDK-24036 Add arrowKeysWrapFocus support
                 

        if (!dropDownController.processKeyDown(event))
        {
            var navigationUnit:uint = event.keyCode;
            if (!NavigationUnit.isNavigationUnit(navigationUnit))
                return;

            var proposedNewIndex:int = NO_SELECTION;
            var currentIndex:int;
            
            if (dropDownController.isOpen)
            {   
                // Normalize the proposed index for getNavigationDestinationIndex
                currentIndex = userProposedSelectedIndex < NO_SELECTION ? NO_SELECTION : userProposedSelectedIndex;

        {
            selectedIndex = userProposedSelectedIndex;  
        }
        else
        {
            changeHighlightedSelection(selectedIndex);
        }
    }

    /**
