That said - it seems like you have 2 transitions that would occur before it would hit the state you are adding buttons - that seems like a way to have problems.