update for 1011601 to support gaia-buttons in edit mode