Fix continue button behaviour