Tidy up context menu stuff
Merge pull request #2090 from darkwing/context-menu-tidying

Tidy up context menu stuff