Small refactor in Widget Editor Controller