         tabBarVisibilityInvalidated = false;
         
         clearActionBarInvalidationFlags();
+        
+        // If there is no focus or the item that had focus isn't 
+        // on the display list anymore, update the focus to be
+        // the active view or the view navigator
+        var stage:Stage = systemManager.stage;
+        if (!stage.focus || !stage.focus.stage || stage.focus == this)
+        {
+            if (activeView)
+                stage.focus = activeView;
+            else
+                stage.focus = this;
+        }
         
         if (currentViewData)
         {

package spark.components
{
import flash.events.Event;
import flash.geom.Rectangle;


            removeElement(currentView);
            currentView.returnedObject = null;
            
            // Grab the data from the old view and persist it
            if (lastAction == PUSH_ACTION || lastAction == CHANGE_SECTION_ACTION)
            {
