Tertiary Window Z-index Bug Fix