Fix for key listener bug in Dropdown
Actual working fix for dropdown keylistener bug
Complete manual merge