Revert back to Idle animation Smoothly

Hi there guys, I feel really stupid for asking such a simple question but it has my mind bent, I have a Animation State Machine that will change it's state depending on what action is currently taking place. My problem is that when you change the State it will play it no problem at all but i need it to revert back to the idle animation.

As of now i have a bunch of methods litrally containing animation.CrossFade("animationName");

The thing is i am switching these in Update as the animation needs to be played. Again i need it to just go from the current animation back to idle SMOOTHLY as of now it jumps. The reason it jumps is that i am doing if(!animation.isPlaying) {currentState = CURRENTSTATE.Idle}. I know the problem is that it is waiting for the animation to be finished then play the Idle animation. I need to find a way to smoothly cross fade to idle

I would post code but it is so simple :D