Ensure hiding the context menu directly before its menu item actions

Closes af3#4321

See merge request !204