Exactly. My wish would be that when working in model space the layer panel gets a second row of on/off lightbulbs, one being the master switch for everywhere (also layouts), the other only for model space viewports. I posted this idea here, (however, it got no tracktion there):