Switch Header/Source opens a duplicate file in same tab instead of focusing on file opened in other tab

My typical workflow is to have 2 vertically split tabs with header files on left side and source files on right side. In Visual Studio + Visual Assist, when toggling between header/sources, the behavior is to bring up focus to the other file in the other tab if it is already open. In Rider, the behavior is to actually open a new copy of the file in the same tab group, even if its already currently visible in the other tab group. It's pretty frustrating since I am following my past habits but often ending up looking at the same file twice. I looked around in settings, but there does not seem to be anything that would let me tweak this behavior. 

It looks like there were a couple similar complaints about this before, for example - https://rider-support.jetbrains.com/hc/en-us/community/posts/360007064159-How-to-stop-the-same-file-from-opening-in-multiple-tab-groups 

Even more specifically, this user appears to have the same work flow as me - https://rider-support.jetbrains.com/hc/en-us/community/posts/360009934260-Rider-for-Unreal-show-h-and-cpp-at-same-time. I think what I am asking for is potentially easier to implement and would alleviate a lot of my frustrations, however a fully automatic .h and .cpp combination in one tab would be very welcome.