Fix menu rendering issue

Fixes RM-2598