Fixes NB#123141, viewer window menu is not as per UI specs