Kodi not exiting.

Ever since I upgraded to Kodi 17. I cannot exit the program properly.

I am using Windows 10 and when I go to exit Kodi, it just sits there and then Windows pops up the “Program not responding” overlay and even if I say wait, it comes back.

I end up having windows force the exit.