PDI-9462 - Fixing menus on SWT elements