Map module freezes

Not a new issue, I saw this before but in LR7 it is a lot worse. Go to the map module, do something and the map freezes. Go out of the module to Library and back to Maps and all is well again - for a few more clicks....