                 
                 if (navigator.activeView)
                 {
-                    updateControlsForView(navigator.activeView);
                     navigator.activeView.addEventListener(PropertyChangeEvent.PROPERTY_CHANGE, 
                                                             view_propertyChangeHandler);
                     
                     // Force the stage focus to be the activated view
                     systemManager.stage.focus = activeView;
                 }
+                
             }
-            
+
             selectedIndexAdjusted = false;
             dataProviderChanged = false;
             selectedIndexChanged = false;

                navigator.setActive(true);
                navigator.visible = true;
                navigator.includeInLayout = true;
                
                // Force a validation of the new navigator to prevent a flicker from
                // occurring in cases where multiple validation passes are required

        // so that animations run again.
        if (disableNextControlAnimation)
            disableNextControlAnimation = false;
        
        // Call base class' commitProperties after the above so that state changes
        // as a result of overlayControls are caught.  This should be okay because
        // TabbedViewNavigator doesn't need any properties in its base class being
        // validated to complete the above code
        super.commitProperties();
        
        // Dispatch the index change event after super.commitProperties() has changed
        // so the callbacks can deal with state changes performed by commitProperties.
        if (changeEvent)
            dispatchEvent(changeEvent);
    }
    
    /**
