Yep you've hit on the same pain point for me too.

Yes it will become the default ui after I finish reaching feature completion with the old gallery interface. it will be a few weeks before i'm there. Thanks for raising the issue! I'll get that fixed soon.