Orbit view around visible objects

I have a model of a building that is inserted in a large site, which I’ve put on a separate layer.
When I orbit the view, it orbits around the largest object in view - the site.
But if I turn off the site’s layer and zoom in to my building, and try to orbit, it still orbits around the site, even though it’s not visible.
I have turned on “Rotate view around gumball” which helps, but I have to remember to always select the building first, which is annoying.
Is there an option to keep only the visible objects in center and orbit around them?

Hello - Zoom Extents (ZE and Enter by default) and then orbiting the view should find the middle of the visible object’s bounding box.