--- a/uifw/AvKon/src/AknNoteDialog.cpp	Tue Apr 27 16:55:05 2010 +0300
+++ b/uifw/AvKon/src/AknNoteDialog.cpp	Tue May 11 16:27:42 2010 +0300
@@ -77,7 +77,7 @@
     
     if ( nodeWindowGroupId == focusedWindowGroupId )
         {
-        return ETrue;
+        return aThis->IsFocused();
         }
 
     TInt count = wsSession.NumWindowGroups( 0 );
@@ -860,18 +860,21 @@
         // Add tactile feedbacup when tap can close note.
         if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
             {
-            if ( DialogFlags()&EEikDialogFlagCloseDialogWhenTapped )
-            	{
-                MTouchFeedback* feedback = MTouchFeedback::Instance();
-                if ( feedback )
+            if ( DialogFlags() & EEikDialogFlagCloseDialogWhenTapped )
+                {
+                if( Rect().Contains( aPointerEvent.iPosition ) )
                     {
-                    feedback->InstantFeedback( ETouchFeedbackPopUp );
+                    MTouchFeedback* feedback = MTouchFeedback::Instance();
+                    if ( feedback )
+                        {
+                        feedback->InstantFeedback( ETouchFeedbackPopUp );
+                        }
                     }
-            	}
+                }
             }
         else if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
             {
-            if ( DialogFlags()&EEikDialogFlagCloseDialogWhenTapped )
+            if ( DialogFlags() & EEikDialogFlagCloseDialogWhenTapped )
                 {
                 if ( ctrl )
                     {