This is the correct solution. It's a much nicer user experience too.