accommodate slight change to behavior of Next button

Change-Id: Idec61541b55109a4e12295658d00ae9838353382