Fixed #1665. Fixed #1667.

app/views/play/WorldMapView.coffee

@@ -136,6 +136,7 @@ module.exports = class WorldMapView extends RootView
     levelID = $(e.target).parents('.level').data('level-id')
     @$levelInfo = @$el.find(".level-info-container[data-level-id=#{levelID}]").show()
     @adjustLevelInfoPosition e
+    @endHighlight()
 
   onMouseLeaveLevel: (e) ->
     return if application.isIPadApp

app/views/play/modal/PlayLevelModal.coffee

@@ -101,6 +101,7 @@ module.exports = class PlayLevelModal extends ModalView
     @chooseHeroView.$el.add('#choose-inventory-button, #choose-hero-header').removeClass 'secret'
     @inventoryView.$el.add('#choose-hero-button, #play-level-button, #choose-inventory-header').addClass 'secret'
     @chooseHeroView.onShown()
+    @inventoryView.endHighlight()
 
   onClickPlayLevel: (e) ->
     return if @$el.find('#play-level-button').prop 'disabled'