Fixes #9293 - Organization/location menu closes correctly
(cherry picked from commit e12b30751f50f294e0fb7f7e9f8aad3fe98d35e2)
Fixes #9293 - Organization/location menu closes correctly
(cherry picked from commit e12b30751f50f294e0fb7f7e9f8aad3fe98d35e2)