Fix in-browser menus

Fix for #4075