--- a/terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp	Wed Jun 09 10:37:30 2010 +0300
+++ b/terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp	Mon Jun 21 16:37:58 2010 +0300
@@ -412,9 +412,13 @@
 		
     if ( aKeyEvent.iCode == EKeyOK || aKeyEvent.iCode == EKeyEnter)
         {
-        // Try to exit with OK as well
-        TryExitL(EAknSoftkeyOk);
-        return EKeyWasConsumed;
+    
+            if(QueryControl()->GetTextLength() > 0) {
+                // Try to exit with OK as well
+                TryExitL(EAknSoftkeyOk);                
+            }
+            
+            return EKeyWasConsumed;
         }
 
 	// app key