--- a/notepad/notepad1/LibSrc/NpdExternalTextEditorDialog.cpp	Tue May 25 12:41:10 2010 +0300
+++ b/notepad/notepad1/LibSrc/NpdExternalTextEditorDialog.cpp	Wed Jun 09 09:40:23 2010 +0300
@@ -310,9 +310,13 @@
         {
            TInt ret = DoSearchL( iFindItemMenu->SearchCase(aCommandId) );
 		   if ( ret == EAknSoftkeyExit )
-			{
-				aCommandId = ret;
-			}
+		       {
+               aCommandId = ret;
+		       }
+		   else
+               {
+               return;
+               }
         }
 
     switch (aCommandId)
@@ -411,6 +415,7 @@
 TInt CNotepadExternalTextDialog::DoSearchL(CFindItemEngine::TFindItemSearchCase aCase)
 	{
 		CFindItemDialog* dialog = CFindItemDialog::NewL( iEditor->Text()->Read(0), aCase );
+	    dialog->EnableSingleClick( ETrue );
 	    TInt ret = dialog->ExecuteLD();
 	    TBuf<128> test = _L("FI returned: ");
 	    test.AppendNum(ret);