Mine was doing that exact same thing Little Beast. I fixed it with a new idle control valve. It gets filled up with carbon like the EGR does. You can clean it but it was a fairly inexpensive part ($50 or so)and its a 5 minute replacement so I just put in a new one.
Jody