Fix bug with Context Menu