             _popUpNavigator.percentHeight = 100;
         
         viewNavigatorPopUp.addEventListener(PopUpEvent.OPEN, viewNavigatorPopUp_openHandler);
+        viewNavigatorPopUp.addEventListener(PopUpEvent.CLOSE, navigatorPopUp_closeHandler);
         viewNavigatorPopUp.addEventListener('mouseDownOutside', navigatorPopUp_mouseDownOutsideHandler, false, 0, true);
         viewNavigatorPopUp.addElement(_popUpNavigator);
         

    private function navigatorPopUp_closeHandler(event:PopUpEvent):void
    {
        viewNavigatorPopUp.removeEventListener(PopUpEvent.CLOSE, navigatorPopUp_closeHandler);
        
        if (_popUpNavigator)
            restoreNavigatorInPopUp();

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