--- a/extras/calcsoft/src/CalcFunc.cpp	Tue May 11 16:14:55 2010 +0300
+++ b/extras/calcsoft/src/CalcFunc.cpp	Tue May 25 12:44:02 2010 +0300
@@ -1150,9 +1150,12 @@
         TRAP_IGNORE(button->OfferKeyEventL(aKeyEvent,aType));
 	    state->SetFlags(EnNormal);
      	}
-    button->SetFocus( EFalse, EDrawNow );      
-    button = iButtons[aNewId];        
-    button->SetFocus( ETrue, EDrawNow );
+    if( aOldId != aNewId )
+    	{
+        button->SetFocus( EFalse, EDrawNow );      
+        button = iButtons[aNewId];        
+        button->SetFocus( ETrue, EDrawNow );
+    	}
     }
 
 // ---------------------------------------------------------

--- a/extras/calcsoft/src/CalcOutSheet.cpp	Tue May 11 16:14:55 2010 +0300
+++ b/extras/calcsoft/src/CalcOutSheet.cpp	Tue May 25 12:44:02 2010 +0300
@@ -785,7 +785,7 @@
 			ScrollToBottomL();
 			}
 		}
-	if ( aType == KAknsMessageSkinChange || aType == KEikMessageUnfadeWindows )
+	if ( aType == KAknsMessageSkinChange )
 		{
 		if (AknLayoutUtils::PenEnabled())
 			{