diff --git a/source/java/org/alfresco/filesys/server/pseudo/PseudoFileImpl.java b/source/java/org/alfresco/filesys/server/pseudo/PseudoFileImpl.java
index 354797c01f..d380487cae 100644
--- a/source/java/org/alfresco/filesys/server/pseudo/PseudoFileImpl.java
+++ b/source/java/org/alfresco/filesys/server/pseudo/PseudoFileImpl.java
@@ -154,9 +154,9 @@ public class PseudoFileImpl implements PseudoFileInterface
         
         boolean isCIFS = sess instanceof SMBSrvSession;
         
-        // Add the desktop action pseudo files
+        // Add the desktop action pseudo files, except to the root folder
         
-        if ( isCIFS && ctx.numberOfDesktopActions() > 0)
+        if ( isCIFS && ctx.numberOfDesktopActions() > 0 && path.equals(FileName.DOS_SEPERATOR_STR) == false)
         {
             // If the file state is null create a file state for the path
 
diff --git a/source/java/org/alfresco/filesys/smb/server/repo/ContentDiskDriver.java b/source/java/org/alfresco/filesys/smb/server/repo/ContentDiskDriver.java
index 439b8429bb..d409551aad 100644
--- a/source/java/org/alfresco/filesys/smb/server/repo/ContentDiskDriver.java
+++ b/source/java/org/alfresco/filesys/smb/server/repo/ContentDiskDriver.java
@@ -545,8 +545,8 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
         ContentContext ctx = (ContentContext) tree.getContext();
         NodeRef infoParentNodeRef = ctx.getRootNode();
         
-        if ( path == null)
-            path = "";
+        if ( path == null || path.length() == 0)
+            path = FileName.DOS_SEPERATOR_STR;
         
         String infoPath = path;
         
@@ -776,7 +776,7 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
             {
                 // See if the folder to be searched has a file state, we can avoid having to walk the path
                 
-                if ( paths[0] != null && paths[0].length() > 1)
+                if ( paths[0] != null && paths[0].length() >= 1)
                 {
                     // Find the node ref for the folder being searched