The issue is indeed just accidentally ending the turn. Either of those solutions would also work, yes.
