Make sure to update text on OK.  Fixes #2131

Change-Id: If589171379bc59ca40b1016d08ca0843f3a95ac7