         // to a correct state.
         ViewTransitionBase.endTransitions();
         
-        // Cleanup handled by navigatorPopUp_closeHandler
+        // Cleanup handled by viewNavigatorPopUp_closeHandler
         viewNavigatorPopUp.close(true);
     }
     

    {
        event.target.removeEventListener(PopUpEvent.OPEN, viewNavigatorPopUp_openHandler);
        
        _popUpNavigatorSizeCache.viewNavigatorPopUpWidth = viewNavigatorPopUp.explicitWidth;
        _popUpNavigatorSizeCache.viewNavigatorPopUpHeight = viewNavigatorPopUp.explicitHeight;
        

    /**
     *  @private
     */ 
    private function viewNavigatorPopUp_closeHandler(event:PopUpEvent):void
    {
        viewNavigatorPopUp.removeEventListener(PopUpEvent.CLOSE, viewNavigatorPopUp_closeHandler);
        viewNavigatorPopUp.removeEventListener('mouseDownOutside', navigatorPopUp_mouseDownOutsideHandler);
        
        if (_popUpNavigator)
