Smart Checkout isn't very smart

So, normally, with git on command-line (CLI), if I have working copy changes and I need to switch to another branch, I would stash, close those file's editor tabs, then checkout the other branch, then pop the last stash for that newly-checked-out branch if it exists, then open those changed file's tabs.

With Smart Checkout, it'll stash my changes and shelve open file tabs (that's the smart part), checkout the other branch I selected, but then unstash the last branch's changes and open any shelved files for the newly-checked-out branch... causing a mess. It won't unstash anything saved for that newly-checked-out branch. The only thing smart about that mess is it's like a smart bomb hit the repo.

Any chance I missed something, or JetBrains will make this actually smart someday? I see no way to change its behavior to be actually smart in Preferences, so it's basically worse than useless (except in some scenarios I don't have most times), and I still have to manually stash in Terminal (or wherever), then right-click checkout in the Git tab to shelve properly, then pop any stashes for that newly-checked-out branch.

Reference: https://blog.jetbrains.com/idea/2012/03/simpler-and-more-powerful-ui-for-git-branches/