--- db.core/src/org/netbeans/modules/db/sql/loader/SQLCloneableEditor.java	
+++ db.core/src/org/netbeans/modules/db/sql/loader/SQLCloneableEditor.java	
@@ -103,6 +103,10 @@ 
 mimeType = SQLDataLoader.SQL_MIME_TYPE,
 preferredID = "sql.source",
 position = 1)
+@TopComponent.Description(
+        preferredID = "sql.source",
+        iconBase = "org/netbeans/modules/db/sql/loader/resources/sql16.png",
+        persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED)
 public final class SQLCloneableEditor extends CloneableEditor implements MultiViewElement {
     private transient JSplitPane splitter;
     private transient JTabbedPane resultComponent;
--- db.core/src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java	
+++ db.core/src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java	
@@ -45,6 +45,7 @@ 
 
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.CharConversionException;
@@ -138,7 +139,14 @@ 
     public SQLEditorSupport(SQLDataObject obj) {
         super(obj, null, new Environment(obj));
         setMIMEType(SQLDataLoader.SQL_MIME_TYPE);
+        obj.addPropertyChangeListener(
+                new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                updateTitles();
     }
+        });
+    }
     
     @Override
     protected boolean notifyModified () {