No MainWindowShow hack - This should be in config/settings :(