Merge pull request #1330 from dorkster/fixes

Don't allow opening other menus when the Exit dialog is open