diff --git a/resources/views/components/frameworks/tailwind/header/export.blade.php b/resources/views/components/frameworks/tailwind/header/export.blade.php
index c8325493..439343b1 100644
--- a/resources/views/components/frameworks/tailwind/header/export.blade.php
+++ b/resources/views/components/frameworks/tailwind/header/export.blade.php
@@ -13,6 +13,7 @@ class="pg-btn-white dark:ring-pg-primary-600 dark:border-pg-primary-600 dark:hov
     </button>
 
     <div
+        x-cloak
         x-show="open"
         x-transition:enter="transition ease-out duration-100"
         x-transition:enter-start="transform opacity-0 scale-95"
diff --git a/resources/views/components/frameworks/tailwind/header/toggle-columns.blade.php b/resources/views/components/frameworks/tailwind/header/toggle-columns.blade.php
index 7e910b8f..26930cea 100644
--- a/resources/views/components/frameworks/tailwind/header/toggle-columns.blade.php
+++ b/resources/views/components/frameworks/tailwind/header/toggle-columns.blade.php
@@ -15,6 +15,7 @@ class="pg-btn-white dark:ring-pg-primary-600 dark:border-pg-primary-600 dark:hov
         </button>
 
         <div
+            x-cloak
             x-show="open"
             x-transition:enter="transition ease-out duration-100"
             x-transition:enter-start="transform opacity-0 scale-95"
diff --git a/src/Concerns/Listeners.php b/src/Concerns/Listeners.php
index 648edf16..20d2d19d 100644
--- a/src/Concerns/Listeners.php
+++ b/src/Concerns/Listeners.php
@@ -4,7 +4,7 @@
 
 use Livewire\Attributes\On;
 
-/** @codeCoverageIgnore  */
+/** @codeCoverageIgnore */
 trait Listeners
 {
     #[On('pg:editable-{tableName}')]
@@ -26,13 +26,17 @@ public function toggleableChanged(string $id, string $field, string $value): voi
     #[On('pg:toggleColumn-{tableName}')]
     public function toggleColumn(string $field): void
     {
-        foreach ($this->visibleColumns as &$column) {
-            if (data_get($column, 'field') === $field) {
-                data_set($column, 'hidden', !data_get($column, 'hidden'));
+        $this->visibleColumns = $this->visibleColumns->map(function (\stdClass | array $column) use ($field) {
+            if (is_object($column) && $column->field === $field) {
+                $column->hidden = !$column->hidden;
+            }
 
-                break;
+            if (is_array($column) && $column['field'] === $field) {
+                $column['hidden'] = !$column['hidden'];
             }
-        }
+
+            return $column;
+        });
 
         $this->persistState('columns');
     }
diff --git a/src/PowerGridComponent.php b/src/PowerGridComponent.php
index 1c857720..381beb73 100644
--- a/src/PowerGridComponent.php
+++ b/src/PowerGridComponent.php
@@ -20,7 +20,7 @@
 /**
  * @property-read mixed $getCachedData
  * @property-read bool $hasColumnFilters
- * @property-read array|BaseCollection $visibleColumns
+ * @property array|BaseCollection $visibleColumns
  */
 class PowerGridComponent extends Component
 {