Switching the broken tool with one thats not broken in my inventory would be great.
Either switching the place of the broken tool with one that has more durability or just putting the broken tool into the inventory and not into the shieldhand or another hotbar slot and then placing the newer tool into the hotbar.