diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ViewerColumnController.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ViewerColumnController.java
index 644190aeabd831ada8ba2319b4c4a4e4bba88774..f644bf858992cfb535bb6f24493764a05588aaf3 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ViewerColumnController.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ViewerColumnController.java
@@ -412,23 +412,17 @@ public class ViewerColumnController {
             return;
         }
         ColumnInfo columnInfo = (ColumnInfo) column.getData();
-        if (order.length < columnInfo.order - 1) {
-            log.debug("Bad column order index (" + columnInfo.order + ")");
-            return;
-        }
-        final int newOrder = order[columnInfo.order];
-        columnInfo.order = newOrder;
-/*
-        final List<ColumnInfo> visibleColumns = getVisibleColumns();
-        if (visibleColumns.size() != order.length) {
-            log.debug("Internal error: visible column size (" + visibleColumns.size() + ") doesn't match order length (" + order.length + ")");
-            return;
-        }
+        boolean updated = false;
         for (int i = 0; i < order.length; i++) {
-            visibleColumns.get(i).order = order[i];
+            if (order[i] == columnInfo.order) {
+                columnInfo.order = i;
+                updated = true;
+                break;
+            }
+        }
+        if (updated) {
+            saveColumnConfig();
         }
-*/
-        saveColumnConfig();
     }
 
     private void saveColumnConfig()
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ViewerColumnRegistry.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ViewerColumnRegistry.java
index 7271c10765c6fcdd470b306e29340bd62bc0b181..cf4877f5d52b66998c37a4715b79dddc6a596f30 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ViewerColumnRegistry.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ViewerColumnRegistry.java
@@ -124,7 +124,7 @@ class ViewerColumnRegistry {
         @Override
         protected IStatus run(DBRProgressMonitor monitor) {
             synchronized (columnsConfig) {
-                log.debug("Save column config " + System.currentTimeMillis());
+                //log.debug("Save column config " + System.currentTimeMillis());
                 flushConfig();
                 saver = null;
             }