Fix breaking modal changes
Tracking issue for
!18409 (closed)