Index: GenericDataAdminTree.java
===================================================================
--- GenericDataAdminTree.java	(revision 48260)
+++ GenericDataAdminTree.java	(working copy)
@@ -33,29 +33,25 @@
  */
 package info.magnolia.module.data.trees;
 
-import info.magnolia.cms.core.ItemType;
-import static info.magnolia.cms.gui.control.Tree.*;
-import info.magnolia.cms.gui.control.Tree;
-import info.magnolia.cms.i18n.Messages;
-import info.magnolia.cms.i18n.MessagesUtil;
-import info.magnolia.cms.util.AlertUtil;
-import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.context.MgnlContext;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.commons.chain.Command;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import static info.magnolia.cms.gui.control.Tree.ACTION_COPY;
+import static info.magnolia.cms.gui.control.Tree.ACTION_MOVE;
+import static info.magnolia.cms.gui.control.Tree.PASTETYPE_ABOVE;
+import static info.magnolia.cms.gui.control.Tree.PASTETYPE_BELOW;
+import static info.magnolia.cms.gui.control.Tree.PASTETYPE_LAST;
+import static info.magnolia.cms.gui.control.Tree.PASTETYPE_SUB;
 import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
 import info.magnolia.cms.exchange.ExchangeException;
+import info.magnolia.cms.gui.control.Tree;
+import info.magnolia.cms.i18n.Messages;
+import info.magnolia.cms.i18n.MessagesUtil;
 import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.cms.util.AlertUtil;
 import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.commands.CommandsManager;
 import info.magnolia.context.Context;
+import info.magnolia.context.MgnlContext;
 import info.magnolia.module.admininterface.AdminTreeMVCHandler;
 import info.magnolia.module.admininterface.DialogHandlerManager;
 import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
@@ -63,12 +59,21 @@
 import info.magnolia.module.data.DataModule;
 import info.magnolia.module.data.TypeDefinition;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.chain.Command;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+
 /**
  * This tree handles the presentation of data items. It also knows about the new "ALL" commands.
  * @author Christoph Hoffmann (BeagleSoft GmbH)
@@ -165,9 +170,9 @@
         final String result = super.renameNode(newLabel);
         final String parentPath = StringUtils.substringBeforeLast(this.getPath(), "/"); //$NON-NLS-1$
         final String newPath = parentPath + "/" + result;
-        if (!getHierarchyManager().isNodeData(newPath)) {
+        if ((!getHierarchyManager().isNodeData(newPath)) && ((StringUtils.isNotEmpty(getDialogName()) || (StringUtils.isNotEmpty(getName()))))) {
             Content current = getHierarchyManager().getContent(newPath);
-            Content dialogConfig = DialogHandlerManager.getInstance().getDialogConfigNode(getDialogName());
+            Content dialogConfig = DialogHandlerManager.getInstance().getDialogConfigNode(StringUtils.defaultIfEmpty(getDialogName(), getName()));
             String nameField = "name";
             if (dialogConfig.hasNodeData(DataConsts.NODE_NAME_FIELD)) {
                 nameField = dialogConfig.getNodeData(DataConsts.NODE_NAME_FIELD).getString();