@@ -29,6 +29,17 @@ describe('getTimezonePickerPresentation', () => {
     ).toBe('America/Los_Angeles')
   })
 
+  it('adds a valid saved timezone that is absent from the curated options', () => {
+    expect(getTimezonePickerPresentation('Etc/GMT+5', 'UTC', timezoneOptions)).toEqual({
+      value: 'Etc/GMT+5',
+      options: [
+        { label: 'Auto: UTC', value: AUTO_TIMEZONE_OPTION_VALUE },
+        { label: 'Etc/GMT+5', value: 'Etc/GMT+5' },
+        ...timezoneOptions,
+      ],
+    })
+  })
+
   it('surfaces an invalid saved timezone without making it selectable', () => {
     expect(getTimezonePickerPresentation('Mars/Olympus', 'UTC', timezoneOptions)).toEqual({
       value: INVALID_TIMEZONE_OPTION_VALUE,
 
@@ -16,6 +16,12 @@ export function getTimezonePickerPresentation(
   timezoneOptions: readonly ComboboxOption[]
 ): TimezonePickerPresentation {
   const hasInvalidTimezone = savedTimezone !== null && !isValidTimezone(savedTimezone)
+  const unlistedTimezone =
+    savedTimezone !== null &&
+    !hasInvalidTimezone &&
+    !timezoneOptions.some((option) => option.value === savedTimezone)
+      ? savedTimezone
+      : null
   const safeInvalidTimezone =
     savedTimezone === null ? '' : sanitizeTimezoneForDisplay(savedTimezone)
 
@@ -34,6 +40,14 @@ export function getTimezonePickerPresentation(
             },
           ]
         : []),
+      ...(unlistedTimezone
+        ? [
+            {
+              label: sanitizeTimezoneForDisplay(unlistedTimezone),
+              value: unlistedTimezone,
+            },
+          ]
+        : []),
       ...timezoneOptions,
     ],
   }
 
@@ -31,6 +31,8 @@ vi.mock('@sim/emcn', () => {
   const passthrough = ({ children }: { children?: ReactNode }) => children ?? null
   return {
     Checkbox: () => null,
+    Chip: ({ children, ...props }: { children?: ReactNode }) =>
+      createElement('button', { type: 'button', ...props }, children),
     ChipConfirmModal: passthrough,
     ChipDatePicker: ({ value, onChange }: { value?: string; onChange: (value: string) => void }) =>
       createElement(
@@ -41,7 +43,27 @@ vi.mock('@sim/emcn', () => {
     ChipModal: passthrough,
     ChipModalBody: passthrough,
     ChipModalError: passthrough,
-    ChipModalField: passthrough,
+    ChipModalField: ({
+      type,
+      value,
+      onChange,
+      children,
+    }: {
+      type?: string
+      value?: string
+      onChange?: (value: string) => void
+      children?: ReactNode | ((aria: Record<string, string>) => ReactNode)
+    }) =>
+      type === 'input'
+        ? createElement('input', {
+            'data-testid': 'modal-input',
+            value: value ?? '',
+            onChange: (event: { currentTarget: { value: string } }) =>
+              onChange?.(event.currentTarget.value),
+          })
+        : typeof children === 'function'
+          ? children({ 'aria-describedby': 'field-hint' })
+          : (children ?? null),
     ChipModalFooter: ({
       primaryAction,
     }: {
@@ -114,7 +136,9 @@ describe('RowModal expiration editing', () => {
     ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
     act(() => root.render(createElement(RowModal, props)))
 
-    expect(container.querySelector('[role="status"]')?.textContent).toBe('Loading timezone…')
+    expect(container.querySelector('[aria-label="Edit expires_at"]')?.textContent).toBe(
+      'Loading timezone…'
+    )
     expect(container.querySelector<HTMLInputElement>('[data-testid="time"]')).toBeNull()
     expect(container.querySelector<HTMLButtonElement>('[data-testid="submit"]')?.disabled).toBe(
       true
@@ -169,7 +193,9 @@ describe('RowModal expiration editing', () => {
 
     act(() => root.render(createElement(RowModal, props)))
 
-    expect(container.querySelector('[role="status"]')?.textContent).toBe('Loading timezone…')
+    expect(container.querySelector('[aria-label="Edit starts_at"]')?.textContent).toBe(
+      'Loading timezone…'
+    )
     expect(container.querySelector<HTMLInputElement>('[data-testid="time"]')).toBeNull()
 
     mockUseTimezoneState.mockReturnValue({
@@ -203,14 +229,72 @@ describe('RowModal expiration editing', () => {
 
     act(() => root.render(createElement(RowModal, props)))
 
-    expect(container.querySelector('[role="status"]')?.textContent).toBe('Invalid timezone')
+    const blockedField = container.querySelector<HTMLButtonElement>(
+      '[aria-label="Edit expires_at"]'
+    )
+    expect(blockedField?.textContent).toBe(String(row.data.expires_at))
     expect(container.querySelector<HTMLButtonElement>('[data-testid="submit"]')?.disabled).toBe(
       true
     )
+    expect(mockToastError).not.toHaveBeenCalled()
+    act(() => blockedField?.click())
     expect(mockToastError).toHaveBeenCalledWith(
       'Your saved timezone “Mars/Olympus” is invalid. Update it in Settings → General before editing Date or Expiration cells.'
     )
     act(() => root.unmount())
     container.remove()
   })
+
+  it('keeps unrelated fields editable and omits blocked date values from the update', async () => {
+    mockUseTimezoneState.mockReturnValue({
+      timezone: 'America/Los_Angeles',
+      savedTimezone: 'Mars/Olympus',
+      status: 'invalid',
+    })
+    const container = document.createElement('div')
+    document.body.appendChild(container)
+    const root = createRoot(container)
+    const mixedTable: TableInfo = {
+      ...table,
+      schema: {
+        columns: [
+          { name: 'name', type: 'string' },
+          { name: 'expires_at', type: 'ttl' },
+        ],
+      },
+    }
+    const mixedRow = { ...row, data: { name: 'Ada', expires_at: row.data.expires_at } }
+    const props = {
+      mode: 'edit' as const,
+      isOpen: true,
+      onClose: vi.fn(),
+      table: mixedTable,
+      row: mixedRow,
+      onSuccess: vi.fn(),
+    }
+
+    act(() => root.render(createElement(RowModal, props)))
+
+    const nameInput = container.querySelector<HTMLInputElement>('[data-testid="modal-input"]')
+    const blockedField = container.querySelector<HTMLButtonElement>(
+      '[aria-label="Edit expires_at"]'
+    )
+    const submit = container.querySelector<HTMLButtonElement>('[data-testid="submit"]')
+    expect(nameInput?.value).toBe('Ada')
+    expect(blockedField?.textContent).toBe(String(row.data.expires_at))
+    expect(submit?.disabled).toBe(false)
+
+    act(() => changeInput(nameInput as HTMLInputElement, 'Grace'))
+    await act(async () => submit?.click())
+
+    expect(mockUpdateRow).toHaveBeenCalledWith({
+      rowId: 'row-1',
+      data: { name: 'Grace' },
+    })
+    expect(props.onSuccess).toHaveBeenCalledTimes(1)
+    expect(mockToastError).not.toHaveBeenCalled()
+
+    act(() => root.unmount())
+    container.remove()
+  })
 })
@@ -1,8 +1,9 @@
 'use client'
 
-import { useEffect, useId, useRef, useState } from 'react'
+import { useId, useRef, useState } from 'react'
 import {
   Checkbox,
+  Chip,
   ChipConfirmModal,
   ChipDatePicker,
   ChipModal,
@@ -22,7 +23,7 @@ import type { ColumnDefinition, TableInfo, TableRow } from '@/lib/table'
 import { columnTypeOf } from '@/lib/table/column-types'
 import { resolveCurrencyCode } from '@/lib/table/currency'
 import { getTimezoneEditBlockedMessage } from '@/app/workspace/[workspaceId]/tables/[tableId]/components/timezone-editing'
-import { useTimezoneState } from '@/hooks/queries/general-settings'
+import { type TimezoneState, useTimezoneState } from '@/hooks/queries/general-settings'
 import { useDeleteTableRow, useDeleteTableRows, useUpdateTableRow } from '@/hooks/queries/tables'
 import {
   cleanCellValue,
@@ -48,12 +49,16 @@ export interface RowModalProps {
 function cleanRowData(
   columns: ColumnDefinition[],
   rowData: Record<string, unknown>,
-  timeZone: string
+  timeZone: string,
+  dateEditorsReady: boolean
 ): Record<string, unknown> {
   const cleanData: Record<string, unknown> = {}
 
   columns.forEach((col) => {
     const value = rowData[col.name]
+    if (columnTypeOf(col).editor === 'date' && !dateEditorsReady) {
+      return
+    }
     try {
       cleanData[col.name] = cleanCellValue(value, col, timeZone)
     } catch {
@@ -85,9 +90,7 @@ export function RowModal({ mode, isOpen, onClose, table, row, rowIds, onSuccess
   if (timezoneState.status === 'ready' && editTimeZoneRef.current === null) {
     editTimeZoneRef.current = timezoneState.timezone
   }
-  const hasDateEditorColumn =
-    mode === 'edit' && columns.some((column) => columnTypeOf(column).editor === 'date')
-  const timezoneUnavailable = hasDateEditorColumn && editTimeZoneRef.current === null
+  const dateEditorsReady = editTimeZoneRef.current !== null
   const timeZone = editTimeZoneRef.current ?? timezoneState.timezone
   const [rowData, setRowData] = useState<Record<string, unknown>>(() =>
     mode === 'edit' && row ? row.data : {}
@@ -100,25 +103,17 @@ export function RowModal({ mode, isOpen, onClose, table, row, rowIds, onSuccess
     updateRowMutation.isPending || deleteRowMutation.isPending || deleteRowsMutation.isPending
 
   const timezoneBlockedMessage = getTimezoneEditBlockedMessage(timezoneState)
-  useEffect(() => {
-    if (
-      !isOpen ||
-      !timezoneUnavailable ||
-      (timezoneState.status !== 'invalid' && timezoneState.status !== 'error') ||
-      !timezoneBlockedMessage
-    ) {
-      return
-    }
-    toast.error(timezoneBlockedMessage)
-  }, [isOpen, timezoneBlockedMessage, timezoneState.status, timezoneUnavailable])
+  const hasEditableColumn = columns.some(
+    (column) => columnTypeOf(column).editor !== 'date' || dateEditorsReady
+  )
 
   const handleFormSubmit = async (e?: React.FormEvent) => {
     e?.preventDefault()
     setError(null)
-    if (timezoneUnavailable) return
+    if (!hasEditableColumn) return
 
     try {
-      const cleanData = cleanRowData(columns, rowData, timeZone)
+      const cleanData = cleanRowData(columns, rowData, timeZone, dateEditorsReady)
 
       if (row) {
         await updateRowMutation.mutateAsync({ rowId: row.id, data: cleanData })
@@ -193,25 +188,27 @@ export function RowModal({ mode, isOpen, onClose, table, row, rowIds, onSuccess
           Update values for {table?.name ?? 'table'}
         </p>
         <form onSubmit={handleFormSubmit} className='contents'>
-          <button type='submit' hidden disabled={isSubmitting || timezoneUnavailable} />
-          {timezoneUnavailable ? (
-            <p role='status' className='px-2 text-[var(--text-muted)] text-small'>
-              {timezoneState.status === 'loading'
-                ? 'Loading timezone…'
-                : timezoneState.status === 'invalid'
-                  ? 'Invalid timezone'
-                  : 'Timezone unavailable'}
-            </p>
-          ) : (
-            columns.map((column) => (
+          <button type='submit' hidden disabled={isSubmitting || !hasEditableColumn} />
+          {columns.map((column) =>
+            columnTypeOf(column).editor === 'date' && !dateEditorsReady ? (
+              <TimezoneBlockedColumnField
+                key={column.name}
+                column={column}
+                value={rowData[column.name]}
+                status={timezoneState.status}
+                onAttemptEdit={() => {
+                  if (timezoneBlockedMessage) toast.error(timezoneBlockedMessage)
+                }}
+              />
+            ) : (
               <ColumnField
                 key={column.name}
                 column={column}
                 value={rowData[column.name]}
                 timeZone={timeZone}
                 onChange={(value) => setRowData((prev) => ({ ...prev, [column.name]: value }))}
               />
-            ))
+            )
           )}
         </form>
         <ChipModalError>{error}</ChipModalError>
@@ -222,7 +219,7 @@ export function RowModal({ mode, isOpen, onClose, table, row, rowIds, onSuccess
         primaryAction={{
           label: isSubmitting ? 'Updating...' : 'Update Row',
           onClick: () => handleFormSubmit(),
-          disabled: isSubmitting || timezoneUnavailable,
+          disabled: isSubmitting || !hasEditableColumn,
         }}
       />
     </ChipModal>
@@ -236,23 +233,72 @@ interface ColumnFieldProps {
   onChange: (value: unknown) => void
 }
 
-function ColumnField({ column, value, timeZone, onChange }: ColumnFieldProps) {
-  const checkboxId = useId()
-  const title = (
+function ColumnTitle({ column }: { column: ColumnDefinition }) {
+  return (
     <>
       {column.name}
       {column.unique && (
         <span className='ml-1.5 font-normal text-[var(--text-tertiary)] text-xs'>(unique)</span>
       )}
     </>
   )
-  // Currency names its code — the modal edits the bare amount, so without it
-  // there is nothing on screen saying which currency the number is in.
+}
+
+function columnFieldHint(column: ColumnDefinition): string {
   const typeLabel =
     column.type === 'currency'
       ? `currency (${resolveCurrencyCode(column.currencyCode)})`
       : column.type
-  const hint = `Type: ${typeLabel}${column.required ? '' : ' (optional)'}`
+  return `Type: ${typeLabel}${column.required ? '' : ' (optional)'}`
+}
+
+interface TimezoneBlockedColumnFieldProps {
+  column: ColumnDefinition
+  value: unknown
+  status: TimezoneState['status']
+  onAttemptEdit: () => void
+}
+
+function TimezoneBlockedColumnField({
+  column,
+  value,
+  status,
+  onAttemptEdit,
+}: TimezoneBlockedColumnFieldProps) {
+  const rawValue =
+    typeof value === 'string'
+      ? value
+      : value === null || value === undefined
+        ? ''
+        : JSON.stringify(value)
+  const displayValue = status === 'loading' ? 'Loading timezone…' : rawValue || 'No value'
+
+  return (
+    <ChipModalField
+      type='custom'
+      title={<ColumnTitle column={column} />}
+      required={column.required}
+      hint={columnFieldHint(column)}
+    >
+      {(aria) => (
+        <Chip
+          {...aria}
+          variant='border'
+          fullWidth
+          onClick={onAttemptEdit}
+          aria-label={`Edit ${column.name}`}
+        >
+          {displayValue}
+        </Chip>
+      )}
+    </ChipModalField>
+  )
+}
+
+function ColumnField({ column, value, timeZone, onChange }: ColumnFieldProps) {
+  const checkboxId = useId()
+  const title = <ColumnTitle column={column} />
+  const hint = columnFieldHint(column)
   const definition = columnTypeOf(column)
 
   if (definition.editor === 'toggle') {