diff --git a/source/java/org/alfresco/web/bean/DocumentDetailsBean.java b/source/java/org/alfresco/web/bean/DocumentDetailsBean.java
index 9872a07e00..825d55721f 100644
--- a/source/java/org/alfresco/web/bean/DocumentDetailsBean.java
+++ b/source/java/org/alfresco/web/bean/DocumentDetailsBean.java
@@ -206,6 +206,14 @@ public class DocumentDetailsBean extends BaseDetailsBean
       return getDocument().hasAspect(ContentModel.ASPECT_MULTILINGUAL_DOCUMENT);
    }
 
+   /**
+    * Adds the node to the dispatch context so that overridden dialogs can be picked up
+    */
+   public void setupEditContext(ActionEvent event)
+   {
+      this.navigator.setupDispatchContext(getDocument());
+   }
+   
    /**
     * Save the state of the panel that was expanded/collapsed
     */
diff --git a/source/web/jsp/dialog/document-details.jsp b/source/web/jsp/dialog/document-details.jsp
index f790b84924..721e3469c0 100644
--- a/source/web/jsp/dialog/document-details.jsp
+++ b/source/web/jsp/dialog/document-details.jsp
@@ -208,7 +208,7 @@
                                  <f:facet name="title">
                                     <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Write">
                                        <a:actionLink id="titleLink1" value="#{msg.modify}" showLink="false" image="/images/icons/edit_properties.gif"
-                                                     action="dialog:editContentProperties" />
+                                                     action="dialog:editContentProperties" actionListener="#{DocumentDetailsBean.setupEditContext}" />
                                     </r:permissionEvaluator>
                                  </f:facet>
                               </h:panelGroup>