diff --git a/modules/backend/classes/WidgetManager.php b/modules/backend/classes/WidgetManager.php
index 5240a2369..c69d86fc6 100644
--- a/modules/backend/classes/WidgetManager.php
+++ b/modules/backend/classes/WidgetManager.php
@@ -117,10 +117,7 @@ class WidgetManager
      * Usage:
      * <pre>
      *   WidgetManager::registerFormWidgets(function($manager){
-     *       $manager->registerFormWidget('Backend\FormWidgets\CodeEditor', [
-     *           'name' => 'Code editor',
-     *           'code'  => 'codeeditor'
-     *       ]);
+     *       $manager->registerFormWidget('Backend\FormWidgets\CodeEditor', 'codeeditor');
      *   });
      * </pre>
      */
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 81f73d5e6..864adb42e 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -1312,7 +1312,7 @@ class Lists extends WidgetBase
     public function onApplySetup()
     {
         if (($visibleColumns = post('visible_columns')) && is_array($visibleColumns)) {
-            $this->columnOverride = array_keys($visibleColumns);
+            $this->columnOverride = $visibleColumns;
             $this->putSession('visible', $this->columnOverride);
         }
 
diff --git a/modules/backend/widgets/lists/partials/_setup_form.htm b/modules/backend/widgets/lists/partials/_setup_form.htm
index acf636069..2b78c1b05 100644
--- a/modules/backend/widgets/lists/partials/_setup_form.htm
+++ b/modules/backend/widgets/lists/partials/_setup_form.htm
@@ -14,11 +14,11 @@
                             <input
                                 type="hidden"
                                 name="column_order[]"
-                                value="<?= $column->columnName ?>" />
+                                value="<?= e($column->columnName) ?>" />
                             <input
                                 id="<?= $this->getId('setupCheckbox-'.$column->columnName) ?>"
-                                name="visible_columns[<?= $column->columnName ?>]"
-                                value="1"
+                                name="visible_columns[]"
+                                value="<?= e($column->columnName) ?>"
                                 <?= $column->invisible ? '' : 'checked="checked"' ?>
                                 type="checkbox" />
                             <label
@@ -63,4 +63,4 @@
             <?= e(trans('backend::lang.form.cancel')) ?>
         </button>
     </div>
-<?= Form::close() ?>
\ No newline at end of file
+<?= Form::close() ?>