This fixes the issue with modal window not closing of "esc"

Reviewer: Cy Casada

Issue: GCP-8935