Merge pull request #7121 from rootp1/fix-terminal-context-menu