Fix menu focus