The current workflow is indeed sub-optimal. The plan is to tackle this as part of an upcoming UI-rework.