diff --git a/package.json b/package.json
index 846d64baa..cfd988ff9 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1",
         "@appwrite.io/pink-legacy": "^1.0.3",
-        "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fed23b",
+        "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@8076873",
         "@faker-js/faker": "^9.9.0",
         "@popperjs/core": "^2.11.8",
         "@sentry/sveltekit": "^8.38.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7bb1f7efc..8cd1a7c41 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -24,8 +24,8 @@ importers:
         specifier: ^1.0.3
         version: 1.0.3
       '@appwrite.io/pink-svelte':
-        specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fed23b
-        version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fed23b(svelte@5.25.3)
+        specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@8076873
+        version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@8076873(svelte@5.25.3)
       '@faker-js/faker':
         specifier: ^9.9.0
         version: 9.9.0
@@ -287,8 +287,8 @@ packages:
   '@appwrite.io/pink-legacy@1.0.3':
     resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==}
 
-  '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fed23b':
-    resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fed23b}
+  '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@8076873':
+    resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@8076873}
     version: 2.0.0-RC.2
     peerDependencies:
       svelte: ^4.0.0
@@ -3831,7 +3831,7 @@ snapshots:
       '@appwrite.io/pink-icons': 1.0.0
       the-new-css-reset: 1.11.3
 
-  '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fed23b(svelte@5.25.3)':
+  '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@8076873(svelte@5.25.3)':
     dependencies:
       '@appwrite.io/pink-icons-svelte': 2.0.0-RC.1(svelte@5.25.3)
       '@floating-ui/dom': 1.6.13
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
index 93f5a48f7..44a6cb572 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
@@ -72,8 +72,6 @@
     const tableId = page.params.table;
 
     onMount(() => {
-        columnsOrder.set(preferences.getColumnOrder(tableId));
-        columnsWidth.set(preferences.getColumnWidths(tableId));
         expandTabs.set(preferences.isTableHeaderExpanded(tableId));
 
         return realtime
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
index e3f16ebcd..9cdab7056 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
@@ -119,6 +119,8 @@
 
     onMount(async () => {
         displayNames = preferences.getDisplayNames();
+        columnsOrder.set(preferences.getColumnOrder(tableId));
+        columnsWidth.set(preferences.getColumnWidths(tableId));
 
         makeTableColumns();
         sortState.set(data.currentSort as SortState);
@@ -132,13 +134,13 @@
     onDestroy(() => ($showCreateAttributeSheet.show = false));
 
     function makeTableColumns() {
-        const selected = preferences.getCustomTableColumns(page.params.table);
+        const selectedColumnsToHide = preferences.getCustomTableColumns(tableId);
 
         const baseColumns = $table.columns.map((col) => ({
             id: col.key,
             title: col.key,
             type: col.type as ColumnType,
-            hide: !!selected?.includes(col.key),
+            hide: !!selectedColumnsToHide?.includes(col.key),
             array: col?.array,
             width: getColumnWidth(col.key, { min: minimumWidth }),
             minimumWidth: minimumWidth,
@@ -159,7 +161,7 @@
                 icon: IconFingerPrint,
                 isEditable: false,
                 isPrimary: false,
-                hide: !!selected?.includes('$id')
+                hide: !!selectedColumnsToHide?.includes('$id')
             },
             {
                 id: '$createdAt',
@@ -170,7 +172,7 @@
                 type: 'datetime',
                 icon: IconCalendar,
                 isEditable: false,
-                hide: !!selected?.includes('$createdAt')
+                hide: !!selectedColumnsToHide?.includes('$createdAt')
             },
             {
                 id: '$updatedAt',
@@ -181,7 +183,7 @@
                 type: 'datetime',
                 icon: IconCalendar,
                 isEditable: false,
-                hide: !!selected?.includes('$updatedAt')
+                hide: !!selectedColumnsToHide?.includes('$updatedAt')
             },
             {
                 id: 'actions',
@@ -236,8 +238,6 @@
             columnsOrder.set(newOrder);
         }
 
-        makeTableColumns();
-
         saveColumnOrderToPreferences(newOrder);
     }
 
@@ -582,6 +582,7 @@
     }
 
     async function handleGoToPage(targetPageNum: number): Promise<void> {
+        jumpToPageReactive = 0;
         if (targetPageNum < 1 || targetPageNum > totalPages) return;
 
         if (!$paginatedRows.hasPage(targetPageNum)) {