Improving Behaviour of ContextMenu