Fixed control flow that was broken by Helix changes

Context menus work again