Fix #507: Slightly rearrange keywords context menu