diff --git a/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorInput.java b/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorInput.java
index 5b623d965bc9e08926cfcafa0a20ebcf4a28d3cc..72fdb311240e094eb3687a8c8ec616e6266f4e8f 100644
--- a/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorInput.java
+++ b/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorInput.java
@@ -46,7 +46,7 @@ public class ERDEditorInput extends ProjectFileEditorInput implements IPersistab
     @Override
     public String getToolTipText()
     {
-        return "ER Diagram";
+        return diagramName;
     }
 
     @Override
diff --git a/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/navigator/DBNDiagram.java b/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/navigator/DBNDiagram.java
index 66b1c7aa74a0230018f1d3acc731e6307479209c..a5b20e50d249c41727a68adc035cf1aa8072c758 100644
--- a/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/navigator/DBNDiagram.java
+++ b/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/navigator/DBNDiagram.java
@@ -35,7 +35,6 @@ import org.jkiss.dbeaver.ui.UIUtils;
 public class DBNDiagram extends DBNResource
 {
     private Image image;
-    private EntityDiagram diagram;
 
     public DBNDiagram(DBNNode parentNode, IResource resource, DBPResourceHandler handler) throws DBException, CoreException
     {
@@ -58,8 +57,4 @@ public class DBNDiagram extends DBNResource
         return image;
     }
 
-    public EntityDiagram getDiagram()
-    {
-        return diagram;
-    }
 }
diff --git a/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/navigator/DBNDiagramFolder.java b/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/navigator/DBNDiagramFolder.java
index f9c9b07a57903eec11ba60eb370d0b95a9e12f81..360bcc31e4b2415661c17bf49c94ee6d59e6eed8 100644
--- a/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/navigator/DBNDiagramFolder.java
+++ b/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/navigator/DBNDiagramFolder.java
@@ -70,17 +70,4 @@ public class DBNDiagramFolder extends DBNResource
         return otherNode instanceof DBNDiagram || super.supportsDrop(otherNode);
     }
 
-    @Override
-    public void dropNodes(Collection<DBNNode> nodes) throws DBException
-    {
-        for (DBNNode node : nodes) {
-            if (node instanceof DBNDiagram) {
-                ERDResourceHandler.createDiagram(
-                    ((DBNDiagram) node).getDiagram(),
-                    node.getNodeName(),
-                    (IFolder) getResource(),
-                    null);
-            }
-        }
-    }
 }