One among best way to avoid this is to make your baby's bath time fun with best bath toys. By doing this, both you and your baby will feel more relax; i.e. you and your baby can splash and play together happily and feel very fun while bathing.
I would suggest you here below best bath toys that can make your baby's bath time fun, for your choices :
1) Green Toys My First Red Tug Boat
2) Vulli Sophie Giraffe Bath Toy - Colors May Vary
3) Fisher-Price Sesame Street Tub Sub
4) Boon Odd Duck - Bob
Filling up your baby tub with the above best bath toys will make your baby's bath time fun, I can guarantee.