Better window management when navigating sources