diff --git a/README.md b/README.md
index 753a4bc559..6983fd46c9 100644
--- a/README.md
+++ b/README.md
@@ -113,9 +113,11 @@ npx source-map-explorer 'packages/code-studio/build/static/js/*.js'
 
 ## Updating Snapshots
 
-Snapshots are used by end-to-end tests to visually verify the output. Sometimes changes are made requiring snapshots to be updated. Run snapshots locally to update first, by running `npm run e2e:update-snapshots`.
+**Note:** You must have [Docker installed](https://docs.docker.com/get-docker/), and `deephaven-core` must already be running on port 10000 on your local machine for all e2e tests.
 
-Once you are satisfied with the snapshots and everything is passing locally, you need to use a docker image to [update snapshots for CI](https://playwright.dev/docs/test-snapshots) (unless you are running the same platform as CI (Ubuntu)). Run `npm run e2e:update-ci-snapshots` to mount the current directory into a docker image and re-run the tests from there. **Note:** You must have [Docker installed](https://docs.docker.com/get-docker/), and `deephaven-core` must already be running on port 10000 on your local machine.
+Snapshots are used by end-to-end tests to visually verify the output. Sometimes changes are made requiring snapshots to be updated. Before running snapshots locally, you must be running the development server with `npm start` or have run `npm run build` recently. Run snapshots locally by running `npm run e2e:update-snapshots`.
+
+Once you are satisfied with the snapshots and everything is passing locally, you need to use a docker image to [update snapshots for CI](https://playwright.dev/docs/test-snapshots) (unless you are running the same platform as CI (Ubuntu)). Run `npm run e2e:update-ci-snapshots` which will mount the current directory into a docker image and re-run the tests from there. Test results will be written to your local directories.
 
 ## Updating Dependencies
 
diff --git a/package.json b/package.json
index 9e4750707f..8e558578ea 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "e2e:headed": "playwright test --project=chromium --headed --debug",
     "e2e:update-snapshots": "playwright test --update-snapshots",
     "version-bump": "lerna version --conventional-commits --create-release github",
-    "e2e:update-ci-snapshots": "docker build --tag web-client-ui-ci-snapshots --file ./tests/update-ci-snapshots/Dockerfile . && docker run --rm --network host --volume $(pwd)/tests:/work/tests/ web-client-ui-ci-snapshots npm run e2e:update-snapshots -- --config=playwright-ci.config.ts"
+    "e2e:update-ci-snapshots": "docker build --tag web-client-ui-ci-snapshots --file ./tests/update-ci-snapshots/Dockerfile . && docker run --rm --network host --volume $(pwd)/tests:/work/tests/ --volume $(pwd)/playwright-report:/work/playwright-report --volume $(pwd)/test-results:/work/test-results web-client-ui-ci-snapshots npm run e2e:update-snapshots -- --config=playwright-ci.config.ts"
   },
   "repository": "https://github.com/deephaven/web-client-ui",
   "devDependencies": {
diff --git a/packages/grid/src/GridRenderer.ts b/packages/grid/src/GridRenderer.ts
index f78414a243..d17a73cb6d 100644
--- a/packages/grid/src/GridRenderer.ts
+++ b/packages/grid/src/GridRenderer.ts
@@ -1592,7 +1592,6 @@ export class GridRenderer {
       modelColumns,
       allColumnXs,
       gridX,
-      calculatedColumnWidths,
       userColumnWidths,
       allColumnWidths,
       movedColumns,
@@ -1660,10 +1659,9 @@ export class GridRenderer {
               break;
             }
 
-            // Use this instead of visibleColumnWidths b/c the columns may be off screen
             const prevColumnWidth =
               userColumnWidths.get(prevModelIndex) ??
-              calculatedColumnWidths.get(prevModelIndex) ??
+              allColumnWidths.get(prevColumnIndex) ??
               columnWidth;
 
             columnGroupLeft -= prevColumnWidth;
@@ -1687,10 +1685,9 @@ export class GridRenderer {
               break;
             }
 
-            // Use this instead of visibleColumnWidths b/c the columns may be off screen
             const nextColumnWidth =
               userColumnWidths.get(nextModelIndex) ??
-              calculatedColumnWidths.get(nextModelIndex) ??
+              allColumnWidths.get(nextColumnIndex) ??
               columnWidth;
 
             columnGroupRight += nextColumnWidth;
diff --git a/playwright.config.ts b/playwright.config.ts
index fa4bb17bf8..6fb52185e5 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -110,7 +110,7 @@ const config: PlaywrightTestConfig = {
   webServer: {
     // Only start the main code-studio server right now
     // To test embed-grid and embed-chart, should have an array set for `webServer` and run them all separately as there's a port check
-    command: 'VITE_PROXY_URL=http://localhost:10000 npm run preview:app',
+    command: 'npm run preview:app -- -- -- --no-open', // Passing flags through npm is fun
     port: 4000,
     timeout: 60 * 1000,
     reuseExistingServer: !process.env.CI,
diff --git a/tests/table.spec.ts b/tests/table.spec.ts
index 700802cfb4..3b8d5dfbc8 100644
--- a/tests/table.spec.ts
+++ b/tests/table.spec.ts
@@ -64,6 +64,37 @@ column_header_group = column_header_group.layout_hints(column_groups=column_grou
   await expect(page.locator('.iris-grid-panel .iris-grid')).toHaveScreenshot();
 });
 
+test('can open a table with column header groups and hidden columns', async ({
+  page,
+}) => {
+  await page.goto('');
+  const consoleInput = page.locator('.console-input');
+  await consoleInput.click();
+
+  const command = `${makeTableCommand('column_header_group')}
+column_groups = [{ 'name': 'YandZ', 'children': ['y', 'z'] }, { 'name': 'All', 'children': ['x', 'YandZ'], 'color': 'white' }]
+column_header_group = column_header_group.layout_hints(column_groups=column_groups, hide=['y', 'z'])`;
+
+  await pasteInMonaco(consoleInput, command);
+  await page.keyboard.press('Enter');
+
+  // Wait for the panel to show
+  await expect(page.locator('.iris-grid-panel')).toHaveCount(1);
+
+  // Wait until it's done loading
+  await expect(page.locator('.iris-grid-panel .loading-spinner')).toHaveCount(
+    0
+  );
+
+  // Model is loaded, need to make sure table data is also loaded
+  await expect(
+    page.locator('.iris-grid .iris-grid-loading-status')
+  ).toHaveCount(0);
+
+  // Now we should be able to check the snapshot
+  await expect(page.locator('.iris-grid-panel .iris-grid')).toHaveScreenshot();
+});
+
 test.describe('tests table operations', () => {
   let page: Page;
 
diff --git a/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-chromium-darwin.png b/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-chromium-darwin.png
new file mode 100644
index 0000000000..d9ee3e0530
Binary files /dev/null and b/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-chromium-darwin.png differ
diff --git a/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-chromium-linux.png b/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-chromium-linux.png
new file mode 100644
index 0000000000..2a6c889f9a
Binary files /dev/null and b/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-chromium-linux.png differ
diff --git a/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-firefox-darwin.png b/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-firefox-darwin.png
new file mode 100644
index 0000000000..19b0781d78
Binary files /dev/null and b/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-firefox-darwin.png differ
diff --git a/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-firefox-linux.png b/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-firefox-linux.png
new file mode 100644
index 0000000000..a1c468f9a3
Binary files /dev/null and b/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-firefox-linux.png differ
diff --git a/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-webkit-darwin.png b/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-webkit-darwin.png
new file mode 100644
index 0000000000..971e83958b
Binary files /dev/null and b/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-webkit-darwin.png differ
diff --git a/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-webkit-linux.png b/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-webkit-linux.png
new file mode 100644
index 0000000000..eafb774e8d
Binary files /dev/null and b/tests/table.spec.ts-snapshots/can-open-a-table-with-column-header-groups-and-hidden-columns-1-webkit-linux.png differ
diff --git a/tests/table.spec.ts-snapshots/tests-table-operations-go-to-1-chromium-darwin.png b/tests/table.spec.ts-snapshots/tests-table-operations-go-to-1-chromium-darwin.png
index 43ba526dcd..6218cd18ef 100644
Binary files a/tests/table.spec.ts-snapshots/tests-table-operations-go-to-1-chromium-darwin.png and b/tests/table.spec.ts-snapshots/tests-table-operations-go-to-1-chromium-darwin.png differ
diff --git a/tests/update-ci-snapshots/Dockerfile b/tests/update-ci-snapshots/Dockerfile
index 9b415d5ae8..58216f7151 100644
--- a/tests/update-ci-snapshots/Dockerfile
+++ b/tests/update-ci-snapshots/Dockerfile
@@ -69,4 +69,4 @@ RUN SKIP_POSTINSTALL=1 npm ci
 COPY . .
 
 # Now build the app. We only need the code-studio built for e2e tests.
-RUN VITE_CORE_API_URL=http://host.docker.internal:10000/jsapi npm run build:app
\ No newline at end of file
+RUN npm run build:app
\ No newline at end of file