Hunter's potion upgrade

Is there any way we can get it so that when you upgrade a refillable potion to a hunter's potion it stays on the same hotkey? For example, I usually have my potions on "7" and when I upgrade my refillable potion to a hunter's potion it automatically switches to the first open item slot. This isn't a super big deal, but it can be annoying when I, being the low ELO scrub that I am, forget to switch my potion in base and miss a charge or two worth of mana.

Any feedback or thoughts would be appreciated, thanks