Agree 100%.
It's fair to expect that every time you press 1, you are back to your Main tool. But if you dare press 1 while you're already on your main tool, then you get punished by having your alternate tool changed!
It happens to me all the time and it's really annoying!