Base: Fix issue with select menu's