diff --git a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
index cb2daf6b75..b212fc5eaa 100644
--- a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
+++ b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
@@ -752,7 +752,12 @@ public class XFormsBean
 
    private String getCurrentAVMPath()
    {
-      final AVMNode node = this.avmBrowseBean.getAvmActionNode();
+      AVMNode node = this.avmBrowseBean.getAvmActionNode();
+      if (node == null)
+      {
+         return this.avmBrowseBean.getCurrentPath();
+      }
+
       final String result = node.getPath();
       return node.isDirectory() ? result : AVMNodeConverter.SplitBase(result)[0];
    }