             
             // Switch orientation states if needed
             if (_active)
-            {
-                var viewState:String = getCurrentViewState();
-                if (currentState != viewState)
-                    setCurrentState(viewState, false);
-            }                
+				updateOrientationState();
                 
             var eventName:String = _active ? 
                 ViewNavigatorEvent.VIEW_ACTIVATE : 

    private function stage_orientationChangeHandler(event:StageOrientationEvent):void
    {
        if (isActive)
            setCurrentState(getCurrentViewState(), false);
    }
    
    
    //--------------------------------------------------------------------------
    //
    //  Overridden methods: UIComponent

        systemManager.stage.addEventListener(StageOrientationEvent.ORIENTATION_CHANGE, 
            stage_orientationChangeHandler, false, 0, true);
        
		updateOrientationState();
    }
    
    //--------------------------------------------------------------------------
