diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/ItemListControl.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/ItemListControl.java
index b9a239970c69e18be5863e7b993f7646d60922dc..aab14278eb2484df7c5a4cc03836eee94e067bc6 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/ItemListControl.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/ItemListControl.java
@@ -103,7 +103,7 @@ public class ItemListControl extends NodeListControl
             contributionManager.add(ActionUtils.makeCommandContribution(workbenchSite, IWorkbenchCommandConstants.FILE_REFRESH));
         }
 
-        if (rootNode instanceof DBNDatabaseNode) {
+        if (rootNode instanceof DBNDatabaseNode && rootNode.isPersisted()) {
             boolean hasReorder = false;
             List<Class<?>> childrenTypes = ((DBNDatabaseNode) rootNode).getChildrenTypes(null);
             for (Class<?> chilType : childrenTypes) {
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
index 4c0f5cb02d680c2b44ccd87a44aee0c6a3c3cf2e..366586c9f8ecc0ba3803888ca39920bb0be91cd6 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
@@ -143,8 +143,10 @@ public abstract class SQLObjectEditor<OBJECT_TYPE extends DBSObject, CONTAINER_T
 
     protected void addObjectReorderActions(List<DBEPersistAction> actions, ObjectReorderCommand command)
     {
-        // Not supported by implementation
-        throw new IllegalStateException("Object reorder is not supported in " + getClass().getSimpleName()); //$NON-NLS-1$
+        if (command.getObject().isPersisted()) {
+            // Not supported by implementation
+            throw new IllegalStateException("Object reorder is not supported in " + getClass().getSimpleName()); //$NON-NLS-1$
+        }
     }
 
     protected abstract void addObjectDeleteActions(List<DBEPersistAction> actions, ObjectDeleteCommand command);
@@ -473,7 +475,11 @@ public abstract class SQLObjectEditor<OBJECT_TYPE extends DBSObject, CONTAINER_T
         public void undoCommand(ObjectReorderCommand command)
         {
             ((DBPOrderedObject)command.getObject()).setOrdinalPosition(command.oldPosition);
-            DBUtils.fireObjectUpdate(command.getObject());
+            final DBSObject parentObject = command.getObject().getParentObject();
+            if (parentObject != null) {
+                // We need to update order in navigator model
+                DBUtils.fireObjectUpdate(parentObject, DBPEvent.REORDER);
+            }
         }
 
     }