Yeah, I think that's how it's working now.

Would it be possible to have a boolean in settings that simply activates or deactivates that behavior?