--- a/bluetoothengine/btui/Ecom/src/BTUIDeviceContainer.cpp	Fri Apr 16 15:08:36 2010 +0300
+++ b/bluetoothengine/btui/Ecom/src/BTUIDeviceContainer.cpp	Mon May 03 12:40:50 2010 +0300
@@ -76,17 +76,7 @@
 	iDeviceList->SetListBoxObserver( this );    
 
     // Set the empty text at basis of the list
-    HBufC* devEmptyText = NULL ;
-    if(iGroup ==EGroupPaired)
-    	{
-    	devEmptyText=iCoeEnv->AllocReadResourceLC( R_BT_NO_PAIRED_DEVICES);
-    	}    	
-    else
-    	{    
-    	devEmptyText=iCoeEnv->AllocReadResourceLC( R_BT_NO_BLOCKED_DEVICES);
-    	}
-    iDeviceList->View()->SetListEmptyTextL(*devEmptyText );
-    CleanupStack::PopAndDestroy(devEmptyText);
+    iDeviceList->View()->SetListEmptyTextL( KNullDesC );
 
     // Set up filenames for Btui and Avkon bitmaps
     TFileName bmpFilename;
@@ -291,7 +281,21 @@
 
 	if(deviceCount >0 )
 		iDeviceList->SetCurrentItemIndex( Max(selectedItem,0 )) ;
-	
+	else
+		{
+		HBufC* devEmptyText = NULL;
+		if(iGroup ==EGroupPaired)
+			{
+			devEmptyText=iCoeEnv->AllocReadResourceLC( R_BT_NO_PAIRED_DEVICES);
+			}    	
+		else
+			{    
+			devEmptyText=iCoeEnv->AllocReadResourceLC( R_BT_NO_BLOCKED_DEVICES);
+			}
+		iDeviceList->View()->SetListEmptyTextL(*devEmptyText );
+		CleanupStack::PopAndDestroy(devEmptyText);
+		}
+		
 	if(addition | removal | previouslySelected!=selectedItem)
     	iDeviceList->DrawDeferred();
 	TRACE_FUNC_EXIT