Context menu not showing up in 2.3

Some more changes are required too, for the context menu to work properly.