SOAP-1501: Refined the behavior of the disclosure button