Issue #2656062 by webflo, Denchev, JamesK, marcoscano: Make hiding of Next button during Selection more robust.