Issue #2821263 by tedbow: If a toolbar item besides the admin menu is open when going into edit mode it is not closed