Finder Windows Cover App Window

Hi all,

Is Sierra, if you have multiple finder windows open, when you are in an app Front most window: if you click on a single finder window, then it becomes the front most window and may cover your app window. This makes good sense.

In high Sierra, given the same scenario, it seems that when you click on a single finder window, then all the finder windows Will override any other app windows. This makes it hard to go back and forth between the finder and the app.

Question: is there a way to set hi see era that only the finder window you click on will become the front most window and not all finder windows?

Thanks Dave