--- a/uiacceltk/hitchcock/ServerCore/Src/alfappserver.cpp	Fri May 14 16:46:13 2010 +0300
+++ b/uiacceltk/hitchcock/ServerCore/Src/alfappserver.cpp	Thu May 27 13:47:19 2010 +0300
@@ -297,8 +297,10 @@
         return;       
         }
     
+    TBool lastActiveDying = EFalse;
     if ( dying->ClientWindowGroup() == iLastActiveClientWg )
         {
+        lastActiveDying = ETrue;
         iLastActiveClientWg = KErrNotFound;
         parentWg = dying->ParentWindowGroupId();
         }
@@ -349,8 +351,10 @@
             }
         delete wgs;
         }
-    
-    TRAP_IGNORE(FocusedWindowGroupChangedL(newFocusSession, parentWg))
+    if( lastActiveDying || newFocusSession )
+        {
+        TRAP_IGNORE(FocusedWindowGroupChangedL(newFocusSession, parentWg));
+        }
     }