diff --git a/controls/slick.columnpicker.js b/controls/slick.columnpicker.js
index 7b3eba8ac..4273ccd22 100644
--- a/controls/slick.columnpicker.js
+++ b/controls/slick.columnpicker.js
@@ -152,6 +152,11 @@
         });
 
         grid.setColumns(newColumnSet);
+        
+        if (grid.getSelectedRows().length > 0) {
+          grid.setSelectedRows(grid.getSelectedRows());
+        }
+
         var evd = new Slick.EventData();
         evd.hiddenColumns = invisibleColumns;
         evd.visibleColumns = visibleColumns;