--- a/uifw/AvKon/src/AknQueryDialog.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknQueryDialog.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -428,6 +428,9 @@
 
     CAknsFrameBackgroundControlContext* cc = (CAknsFrameBackgroundControlContext*)AknsDrawUtils::ControlContext( this );
     cc->SetCenter(KAknsIIDQsnFrPopupCenterQuery);
+    
+    // Check Query is wait of not.
+    TBool isWaitDialog( ( DialogFlags() & EEikDialogFlagWait ) != 0 );
 
     SetGloballyCapturing(ETrue); 
     TInt ret = CAknDialog::RunLD();
@@ -436,7 +439,12 @@
         {
         soundSystem->PopContext();
         }
-    SetGloballyCapturing(EFalse); 
+    // If wait QueryDialog, instance will be deleted right after RunLD via CBA
+    if ( !isWaitDialog )
+        {
+        SetGloballyCapturing(EFalse); 
+        }
+
     _AKNTRACE_FUNC_EXIT;
     return ret;
     }