Fixed context menu after rewrite