--- a/textinput/peninputvkbcn/src/peninputvkblayout.cpp	Tue May 11 16:31:42 2010 +0300
+++ b/textinput/peninputvkbcn/src/peninputvkblayout.cpp	Tue May 25 13:03:44 2010 +0300
@@ -254,6 +254,7 @@
         case ECmdPenInputWindowClose:
 			iVkbWindow->Hide(ETrue);
             LayoutOwner()->Hide(ETrue);            
+            iVkbWindow->HideTooltipOnFSQ();
             break;
         case ECmdPenInputRange:
             SetCurrentRange(*data);
@@ -605,6 +606,13 @@
             
         case EVkbEventCompFieldNoChars:       
             SendEventToVkbControl(EVkbEventComposition2Standby,NULL);            
+            SendEventToVkbControl( aEventType, aCtrl, aEventData );
+            if ( iUiStateMgr )
+            	{
+				iUiStateMgr->SetCurrentUiState( iUiStateMgr->UiStateStandbycn());
+				ForceEditGainFocus( EInputContextFieldGetFocus );
+            	}
+            break;
         case EVkbEventClearContent:
             SendEventToVkbControl(aEventType,aCtrl,aEventData);
             break;