clicking a 'window list' button for a selected-but-hidden window minimises the window

If I have a window selected, but buried under other windows, I would like to be able to click its button in the window list to bring it to the top, but clicking the button minimises the window instead, because it is selected, so I end up having to click the button twice.

I would prefer the window list buttons to only minimise the window it is was already on top of the other windows. If the window is covered by other windows, it would be better for the button to bring the window to the top.

This situation arises quite often for me, because I have the mouse selecting windows when it passes over them, but not bringing them to the top.