Pool Swim Data Screen - Drill Log Hangs watch

When editing Pool Swim Data screens while a workout is active, scrolling to the Drill Log hangs the watch and does not allow you to move or exit the Drill screen.

Works fine when not activity is not running.