--- a/filemanager/App/src/CFileManagerMainView.cpp	Wed Jun 09 09:28:11 2010 +0300
+++ b/filemanager/App/src/CFileManagerMainView.cpp	Mon Jun 21 15:26:15 2010 +0300
@@ -220,11 +220,6 @@
         return;
         }
 
-    if ( !FeatureManager().IsRemoteStorageFwSupported() )
-        {
-        aMenuPane.SetItemDimmed( EFileManagerRemoveDrives, ETrue );
-        }
-
     CFileManagerItemProperties* prop = iEngine.GetItemInfoLC(
         iContainer->ListBoxCurrentItemIndex() );
     TUint32 drvState( 0 );
@@ -239,6 +234,7 @@
         // No drive selected
         aMenuPane.SetItemDimmed( EFileManagerMemoryStorage, ETrue );
         aMenuPane.SetItemDimmed( EFileManagerEject, ETrue );
+        aMenuPane.SetItemDimmed( EFileManagerRemoveDrives, ETrue );
         }
     else
         {
@@ -256,6 +252,11 @@
             {
             aMenuPane.SetItemDimmed( EFileManagerMemoryStorage, ETrue );
             }
+        if  ( !FeatureManager().IsRemoteStorageFwSupported() ||
+              !( drvInfo.iState & TFileManagerDriveInfo::EDriveRemote ) )
+            {
+            aMenuPane.SetItemDimmed( EFileManagerRemoveDrives, ETrue );
+            }
         }
 
 #ifndef RD_FILE_MANAGER_BACKUP