diff --git a/CHANGELOG.md b/CHANGELOG.md
index 883695ef2..e3e60a676 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.2.4] - 2024-03-01
+### Bug Fixes
+- Collapsing Columns fix when multiple tables are displayed on a page by @lrljoe
+
 ## [v3.2.3] - 2024-03-01
 ### New Features
 - Add capability to customise colors/styling on the Pagination Per-Page Dropdown by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1677
diff --git a/docs/datatable/events.md b/docs/datatable/events.md
index 445822bd0..69f52a104 100644
--- a/docs/datatable/events.md
+++ b/docs/datatable/events.md
@@ -8,7 +8,7 @@ These are the available events on the datatable component that you can fire from
 ### refreshDatatable
 
 ```php
-$this->emit('refreshDatatable');
+$this->dispatch('refreshDatatable');
 ```
 
 Calls `$refresh` on the component. Good for updating from external sources or as an alternative to polling.
@@ -18,7 +18,7 @@ Calls `$refresh` on the component. Good for updating from external sources or as
 You can have the table sort a specific column:
 
 ```php
-$this->emit('setSort', 'name', 'asc');
+$this->dispatch('setSort', 'name', 'asc');
 ```
 
 ### clearSorts
@@ -26,7 +26,7 @@ $this->emit('setSort', 'name', 'asc');
 You can clear all the applied sorts:
 
 ```php
-$this->emit('clearSorts');
+$this->dispatch('clearSorts');
 ```
 
 ### setFilter
@@ -34,7 +34,7 @@ $this->emit('clearSorts');
 You can have the table run a specific filter:
 
 ```php
-$this->emit('setFilter', 'status', '1');
+$this->dispatch('setFilter', 'status', '1');
 ```
 
 ### clearFilters
@@ -42,5 +42,5 @@ $this->emit('setFilter', 'status', '1');
 You can have the table clear all filters:
 
 ```php
-$this->emit('clearFilters');
-```
\ No newline at end of file
+$this->dispatch('clearFilters');
+```
diff --git a/resources/views/components/table/collapsed-columns.blade.php b/resources/views/components/table/collapsed-columns.blade.php
index 1e4aea9a5..49569281a 100644
--- a/resources/views/components/table/collapsed-columns.blade.php
+++ b/resources/views/components/table/collapsed-columns.blade.php
@@ -24,7 +24,7 @@
 
     <tr
         x-data
-        @toggle-row-content.window="$event.detail.row === {{ $rowIndex }} ? $el.classList.toggle('{{ $component->isBootstrap() ? 'd-none' : 'hidden' }}') : null"
+        @toggle-row-content.window="($event.detail.tableName === '{{ $tableName }}' && $event.detail.row === {{ $rowIndex }}) ? $el.classList.toggle('{{ $component->isBootstrap() ? 'd-none' : 'hidden' }}') : null"
 
         wire:key="{{ $tableName }}-row-{{ $row->{$this->getPrimaryKey()} }}-collapsed-contents"
         wire:loading.class.delay="opacity-50 dark:bg-gray-900 dark:opacity-60"
diff --git a/resources/views/components/table/td/collapsed-columns.blade.php b/resources/views/components/table/td/collapsed-columns.blade.php
index 497be487c..29248b1cd 100644
--- a/resources/views/components/table/td/collapsed-columns.blade.php
+++ b/resources/views/components/table/td/collapsed-columns.blade.php
@@ -16,7 +16,7 @@
             @if (! $hidden)
                 <button
                     x-cloak x-show="!currentlyReorderingStatus"
-                    x-on:click.prevent="$dispatch('toggle-row-content', {'row': {{ $rowIndex }}}); open = !open"
+                    x-on:click.prevent="$dispatch('toggle-row-content', {'tableName': '{{ $tableName }}', 'row': {{ $rowIndex }}}); open = !open"
                 >
                     <x-heroicon-o-plus-circle x-cloak x-show="!open" class="text-green-600 h-6 w-6" />
                     <x-heroicon-o-minus-circle x-cloak x-show="open" class="text-yellow-600 h-6 w-6" />
@@ -36,7 +36,7 @@
             @if (! $hidden)
                 <button
                     x-cloak x-show="!currentlyReorderingStatus"
-                    x-on:click.prevent="$dispatch('toggle-row-content', {'row': {{ $rowIndex }}});open = !open"
+                    x-on:click.prevent="$dispatch('toggle-row-content', {'tableName': '{{ $tableName }}', 'row': {{ $rowIndex }}});open = !open"
                     class="p-0"
                     style="background:none;border:none;"
                 >
diff --git a/src/LaravelLivewireTablesServiceProvider.php b/src/LaravelLivewireTablesServiceProvider.php
index 7cc26cac3..015ba8684 100644
--- a/src/LaravelLivewireTablesServiceProvider.php
+++ b/src/LaravelLivewireTablesServiceProvider.php
@@ -14,7 +14,7 @@ class LaravelLivewireTablesServiceProvider extends ServiceProvider
     public function boot(): void
     {
 
-        AboutCommand::add('Rappasoft Laravel Livewire Tables', fn () => ['Version' => '3.2.3']);
+        AboutCommand::add('Rappasoft Laravel Livewire Tables', fn () => ['Version' => '3.2.4']);
 
         $this->mergeConfigFrom(
             __DIR__.'/../config/livewire-tables.php', 'livewire-tables'