Fixed enter selecting dropdown item

Fixed enter selection a simplified whole thing