diff --git a/.changeset/smooth-grid-and-sidebar.md b/.changeset/smooth-grid-and-sidebar.md
new file mode 100644
index 00000000..2a35d07a
--- /dev/null
+++ b/.changeset/smooth-grid-and-sidebar.md
@@ -0,0 +1,12 @@
+### Bug Fixes
+- Rejected edits now show one message with the failure count instead of a toast per edit
+- Close All Tabs and Close Other Tabs ask before discarding unsaved edits
+- Arrow keys switch sidebar tabs again
+- Find & replace keeps its text across sidebar tab switches
+- A filter that matches nothing says "No rows match these filters"
+
+### Changes
+- Tables, the sidebar and the status bar stay on screen while loading, so there is no flicker or layout shift
+- Switching connections shows the connecting screen straight away
+- NULL markers are on by default
+- Long text columns scroll with less work
diff --git a/src/lib/components/AppMenuBar.svelte b/src/lib/components/AppMenuBar.svelte
index fe146077..21350988 100644
--- a/src/lib/components/AppMenuBar.svelte
+++ b/src/lib/components/AppMenuBar.svelte
@@ -80,7 +80,7 @@
         <Menubar.Separator class={sepCls} />
         {@render item("settings", "Settings…", "openSettings", "Mod+,")}
         {@render item("x", "Close tab", "closeTab", "Mod+W")}
-        {@render item("trash-2", "Close all tabs", "closeAllTabs", "Mod+Shift+W")}
+        {@render item("x", "Close all tabs", "closeAllTabs", "Mod+Shift+W")}
       </Menubar.Content>
     </Menubar.Portal>
   </Menubar.Menu>
diff --git a/src/lib/components/DataTable.svelte b/src/lib/components/DataTable.svelte
index c8d515ff..2af1b16c 100644
--- a/src/lib/components/DataTable.svelte
+++ b/src/lib/components/DataTable.svelte
@@ -17,6 +17,7 @@
   import { toast } from "$lib/components/ui/sonner/toast.svelte.js";
   import * as ContextMenu from "$lib/components/ui/context-menu/index.js";
   import * as DropdownMenu from "$lib/components/ui/dropdown-menu/index.js";
+  import { Button } from "$lib/components/ui/button/index.js";
   import ArrowUpDown from "@lucide/svelte/icons/arrow-up-down";
   import ArrowUp from "@lucide/svelte/icons/arrow-up";
   import ArrowDown from "@lucide/svelte/icons/arrow-down";
@@ -376,6 +377,11 @@ import FilterX from "@lucide/svelte/icons/filter-x";
      *  treat as roaming. */
     /** True when every row has been loaded in infinite scroll mode (no more pages). */
     endOfResults = false,
+    /** True when a row search or filter is narrowing the result, so an empty
+     *  grid means "nothing matched", not "the table is empty". */
+    filtered = false,
+    /** Clears the row search and every filter (the filtered empty state's button). */
+    onclearfilters = /** @type {(() => void) | null} */ (null),
     /** Active row-search query (toolbar search). Matched substrings are
      *  highlighted in the drawn cell text. */
     searchQuery = '',
@@ -2080,6 +2086,8 @@ import FilterX from "@lucide/svelte/icons/filter-x";
     const entries = [...pendingEdits.values()].filter((e) => !pendingDeletes.has(e.rowIdx));
     /** @type {typeof entries} */
     const failed = [];
+    /** @type {string[]} */
+    const failReasons = [];
     let okCount = 0;
     for (const edit of entries) {
       try {
@@ -2087,7 +2095,7 @@ import FilterX from "@lucide/svelte/icons/filter-x";
         okCount++;
       } catch (err) {
         failed.push(edit);
-        toast.error("Could not save", { description: String(err) });
+        failReasons.push(`${columns[edit.colIdx]?.name ?? "?"}: ${String(err)}`);
       }
     }
 
@@ -2098,8 +2106,8 @@ import FilterX from "@lucide/svelte/icons/filter-x";
         await ondelete({ rowIndices: deleteIndices });
         deletedCount = deleteIndices.length;
         pendingDeletes = new Set();
-      } catch (err) {
-        toast.error("Could not delete", { description: String(err) });
+      } catch {
+        // error toast already shown by ondelete
       }
     }
 
@@ -2126,11 +2134,20 @@ import FilterX from "@lucide/svelte/icons/filter-x";
     futureEdits = [];
     // Sync the cross-unmount cache to the post-apply state (clears it when empty).
     savePendingChanges(_persistKey, pendingEdits, pendingDeletes);
+    // One toast for every failed edit, not one per edit, and it says where the
+    // edits went. A few distinct reasons are enough to act on.
+    if (failed.length > 0) {
+      const n = failed.length;
+      const title = deletedCount > 0
+        ? (n === 1 ? "1 edit wasn't saved and was discarded" : `${n} edits weren't saved and were discarded`)
+        : `Couldn't save ${n} edit${n === 1 ? "" : "s"}. ${n === 1 ? "It's" : "They're"} still staged`;
+      toast.error(title, { description: [...new Set(failReasons)].slice(0, 3).join("\n"), code: true, duration: 10000 });
+    }
     if (okCount > 0 || deletedCount > 0) {
       const parts = [];
       if (okCount > 0) parts.push(`${okCount} cell${okCount === 1 ? "" : "s"} updated`);
       if (deletedCount > 0) parts.push(`${deletedCount} row${deletedCount === 1 ? "" : "s"} deleted`);
-      toast.success("Changes applied", { description: parts.join(", ") });
+      toast.success(failed.length > 0 ? "Some changes applied" : "Changes applied", { description: parts.join(", ") });
     }
   }
 
@@ -5507,27 +5524,38 @@ import FilterX from "@lucide/svelte/icons/filter-x";
 
   /** The measuring half of truncText - only reached on a cache miss. */
   function _truncMeasure(ctx, text, maxW, len) {
+    // Only the head of a long value can ever be on screen, so only the head is
+    // measured. measureText shapes every character it is given, and a long cell
+    // (a 2,000-character Devanagari or markdown chunk) paid a whole-string
+    // HarfBuzz pass per cell scrolled into view to show its first 60. Four times
+    // the monospace estimate covers narrow fallback glyphs and zero-width
+    // combining marks; a head that still fits falls back to the whole string.
+    let lim = len
+    if (_glyphW > 0) {
+      const cap = Math.ceil(maxW / _glyphW) * 4 + 16
+      if (cap < len && ctx.measureText(text.slice(0, cap)).width > maxW) lim = cap
+    }
     // For truncation, always measure accurately - the monospace estimate can
     // over-count for non-ASCII characters (Arabic, CJK, etc.) that fall back
     // to a narrower font, leaving an apparent gap after the ellipsis.
-    if (ctx.measureText(text).width <= maxW) return text
+    if (lim === len && ctx.measureText(text).width <= maxW) return text
     // Monospace fast path: the slice length is plain arithmetic, verified with a
     // couple of real measurements (non-ASCII glyphs fall back to narrower fonts,
     // so a failed verify drops to the exact binary search below). This replaces
     // ~10 measureText binary-search probes per truncated cell per frame with 2-3.
     if (_glyphW > 0) {
-      let k = Math.max(0, Math.min(len - 1, Math.floor(maxW / _glyphW) - 1))
+      let k = Math.max(0, Math.min(lim - 1, Math.floor(maxW / _glyphW) - 1))
       if (ctx.measureText(text.slice(0, k) + '…').width <= maxW) {
         // Grow greedily while it still fits (covers narrow fallback glyphs);
         // bounded so the worst case stays O(1).
-        for (let step = 0; step < 4 && k < len - 1; step++) {
+        for (let step = 0; step < 4 && k < lim - 1; step++) {
           if (ctx.measureText(text.slice(0, k + 1) + '…').width <= maxW) k++
           else break
         }
         return text.slice(0, k) + '…'
       }
     }
-    let lo = 0, hi = len
+    let lo = 0, hi = lim
     while (lo < hi) {
       const mid = (lo + hi + 1) >> 1
       if (ctx.measureText(text.slice(0, mid) + '…').width <= maxW) lo = mid
@@ -6039,11 +6067,13 @@ import FilterX from "@lucide/svelte/icons/filter-x";
   })
   /** Paint holding. A table switch empties `columns` the moment it starts, and
    *  drawing that frame blanked the grid for the whole round trip - the old
-   *  table, then nothing, then the new one. For the same grace window as the
-   *  spinner the canvas keeps the last table's pixels and the swap lands as one
-   *  frame. Never on a surface that holds nothing yet: a fresh or just-resized
-   *  canvas is blank (or black in WebKit) and has to be painted. */
-  const holdPaint = $derived(loading && columns.length === 0 && !loadingVisible)
+   *  table, then nothing, then the new one. The canvas keeps the last table's
+   *  pixels until the new one lands; past the grace window the loading overlay
+   *  dims them. It used to hold only for the grace window, so a load just over
+   *  it strobed: old table, ~70ms of empty grid, new table. Never on a surface
+   *  that holds nothing yet: a fresh or just-resized canvas is blank (or black
+   *  in WebKit) and has to be painted. */
+  const holdPaint = $derived(loading && columns.length === 0)
   let _surfaceHasFrame = false
   /** Reactivity budget: the pill re-reads at most this often, not per frame. */
   const SPAN_PUBLISH_MS = 150
@@ -8628,8 +8658,11 @@ import FilterX from "@lucide/svelte/icons/filter-x";
                  place of it: swapping the grid out destroyed the canvas on every
                  table open, and a load that landed a frame later flashed a
                  spinner plus a brand-new compositor layer. -->
+            <!-- Over the held frame of the previous table, dimmed, and with no
+                 fade: a 300ms fade-in on a state that often lives under 150ms
+                 was itself the flash. -->
             {#if loadingVisible}
-              <div class="pointer-events-none absolute inset-0 z-[3] flex flex-col animate-in fade-in duration-300">
+              <div class="pointer-events-none absolute inset-0 z-[3] flex flex-col bg-panel/70">
                 <TableLoading {embedded} />
               </div>
             {/if}
@@ -8656,6 +8689,14 @@ import FilterX from "@lucide/svelte/icons/filter-x";
                       <p class="text-ui-sm text-muted-foreground">Loading rows…</p>
                     </div>
                   {/if}
+                {:else if filtered}
+                  <FilterX class="size-8 text-muted-foreground" />
+                  <p class="text-ui-sm text-muted-foreground">No rows match these filters</p>
+                  {#if onclearfilters}
+                    <Button type="button" variant="outline" size="sm" class="pointer-events-auto mt-1" onclick={() => onclearfilters?.()}>
+                      Clear filters
+                    </Button>
+                  {/if}
                 {:else}
                   <Table2 class="size-8 text-muted-foreground" />
                   <p class="text-ui-sm text-muted-foreground">No rows in this table</p>
diff --git a/src/lib/components/FindReplacePanel.svelte b/src/lib/components/FindReplacePanel.svelte
index 30deecea..110af8e2 100644
--- a/src/lib/components/FindReplacePanel.svelte
+++ b/src/lib/components/FindReplacePanel.svelte
@@ -46,6 +46,13 @@
     onreveal = /** @type {(rowIdx: number, colIdx: number) => void} */ (() => {}),
     /** Assigned here; the shell calls it to focus the Find field. */
     focusFind = $bindable(/** @type {() => void} */ (() => {})),
+    // What was typed and how it matches. Bindable so the sidebar can hold them:
+    // the panel remounts on every visit, and local state came back empty.
+    findText = $bindable(''),
+    replaceText = $bindable(''),
+    useRegex = $bindable(false),
+    wholeValue = $bindable(false),
+    caseSensitive = $bindable(false),
   } = $props()
 
   /**
@@ -58,19 +65,12 @@
    */
   const ANY_COLUMN = -2
   let colIdx = $state(-1)
-  /**
-   * The three matching options are independent, the way they are in an editor's
-   * find widget. They were two booleans and a three-way `mode`, so "whole
-   * value" and "regular expression" were the same field and turning one on
-   * turned the other off - only ever two of the three lit up, and the pair that
-   * combines most usefully (a pattern that has to match the whole cell) could
-   * not be expressed at all.
-   */
-  let useRegex = $state(false)
-  let wholeValue = $state(false)
-  let caseSensitive = $state(false)
-  let findText = $state('')
-  let replaceText = $state('')
+  // The three matching options (useRegex, wholeValue, caseSensitive, props
+  // above) are independent, the way they are in an editor's find widget. They
+  // were two booleans and a three-way `mode`, so "whole value" and "regular
+  // expression" were the same field and turning one on turned the other off -
+  // only ever two of the three lit up, and the pair that combines most usefully
+  // (a pattern that has to match the whole cell) could not be expressed at all.
   let applying = $state(false)
   /** @type {HTMLInputElement | null} */
   let findEl = $state(null)
diff --git a/src/lib/components/Sidebar.svelte b/src/lib/components/Sidebar.svelte
index 4bd77153..909051c6 100644
--- a/src/lib/components/Sidebar.svelte
+++ b/src/lib/components/Sidebar.svelte
@@ -452,7 +452,7 @@
     { id: 'databases', label: 'Databases', icon: 'database' },
     // Saved queries, in folders: the SQL you keep is what you open next.
     { id: 'queries',   label: 'Queries',   icon: 'file-code' },
-    { id: 'objects',   label: 'Objects',   icon: 'blocks' },
+    { id: 'objects',   label: 'Objects',   icon: 'shapes' },
     { id: 'recent',    label: 'Recent',    icon: 'clock' },
     // Last, and not a list: find & replace is a tool that works on the table
     // you already have open, so it belongs where the other panels live rather
@@ -469,6 +469,26 @@
   }
   let sidebarTab = $state(loadSidebarTab())
 
+  // Panels mount on first visit and then stay, hidden while another tab is up.
+  // Rebuilding one on every switch threw its DOM and scroll away, and the
+  // rebuild was the flash between tabs. Find & replace still mounts per visit:
+  // it previews matches against the open table's rows, which a hidden copy
+  // would keep recomputing (its typed text lives here, so it survives).
+  const activePanel = $derived(sidebarTab)
+  let seenPanels = $state(new Set([untrack(() => sidebarTab)]))
+  $effect(() => {
+    const p = activePanel
+    if (!untrack(() => seenPanels.has(p))) seenPanels = new Set([...untrack(() => seenPanels), p])
+  })
+  /** @param {string} p */
+  const panelMounted = (p) => activePanel === p || seenPanels.has(p)
+  // Find & replace's inputs, held here because the panel itself remounts.
+  let frFind = $state('')
+  let frReplace = $state('')
+  let frRegex = $state(false)
+  let frWhole = $state(false)
+  let frCase = $state(false)
+
   $effect(() => {
     openFindReplace = () => {
       sidebarTab = 'search'
@@ -540,26 +560,31 @@
    */
   const TAB_EMPTY = {
     tables:    { icon: 'table-2',    title: 'No tables',    hint: 'Nothing in this schema yet.' },
-    objects:   { icon: 'blocks',     title: 'No objects',   hint: 'Views, functions, triggers and the like show up here.' },
+    objects:   { icon: 'shapes',     title: 'No objects',   hint: 'Views, functions, triggers and the like show up here.' },
     recent:    { icon: 'clock',      title: 'No recents',   hint: 'Tables you open appear here.' },
     databases: { icon: 'database',   title: 'No databases', hint: 'Nothing else on this server.' },
   }
-  const tabIsEmpty = $derived(
-    // Objects always draws its group headers: an empty group still has its +.
-    sidebarTab !== 'search' && sidebarTab !== 'queries' && sidebarTab !== 'objects' && !loadingTables && !!connectionName && tabCounts[sidebarTab] === 0,
-  )
-  /** True when the tab has rows but the filter hid all of them. */
-  const tabEmptyFromFilter = $derived(
-    tabIsEmpty &&
-      !!debouncedFilter &&
-      (sidebarTab === 'tables'
-        ? regularTablesUnpinned.length + visiblePinnedTables.length > 0
-        : sidebarTab === 'objects'
-          ? views.length + matViews.length > 0
-          : sidebarTab === 'databases'
-            ? dbEntries.length > 0
-            : recentTables.length > 0),
+  /** No databases listed yet, but a fetch is owed, running or failed: the
+   *  section shows its dots or its error, never "No databases". */
+  const dbHeld = $derived(
+    canSwitchDb && dbEntries.length === 0 && (dbEntriesLoading || !dbEntriesLoaded || !!dbEntriesError),
   )
+  /** @param {SidebarTab} t */
+  const isTabEmpty = (t) =>
+    // Objects always draws its group headers: an empty group still has its +.
+    t !== 'search' && t !== 'queries' && t !== 'objects' && !loadingTables && !!connectionName &&
+    tabCounts[t] === 0 && !(t === 'databases' && dbHeld)
+  /** True when the tab has rows but the filter hid all of them. @param {SidebarTab} t */
+  const isTabEmptyFromFilter = (t) =>
+    isTabEmpty(t) &&
+    !!debouncedFilter &&
+    (t === 'tables'
+      ? regularTablesUnpinned.length + visiblePinnedTables.length > 0
+      : t === 'objects'
+        ? views.length + matViews.length > 0
+        : t === 'databases'
+          ? dbEntries.length > 0
+          : recentTables.length > 0)
 
   /** How many rows each tab holds BEFORE the filter. @type {Record<SidebarTab, number>} */
   const tabTotals = $derived({
@@ -586,18 +611,16 @@
   $effect(() => { try { localStorage.setItem(SIDEBAR_TAB_KEY, sidebarTab) } catch {} })
 
 
-  // The old per-section visibility flags are now just "is this the open tab".
-  // Keeping the names means the ~900 lines of list markup below did not have to
-  // be rewritten to ask a different question.
-  const showTables    = $derived(sidebarTab === 'tables')
-  const showRecent    = $derived(sidebarTab === 'recent')
+  // Each list tab renders its own panel (see `listPanel` in the markup), which
+  // asks `t === 'tables'` where the shared panel asked "is this the open tab".
   // Pinned is a section of Tables, not a tab of its own. It was a fifth icon in
   // the strip that held, for most connections, nothing at all - and it split
   // "the tables in this schema" across two places you had to switch between to
   // see. It renders above the Tables header, which is where the pins already
   // sorted in `selectableOrder`.
-  const showPins      = $derived(sidebarTab === 'tables')
-  const showDatabases = $derived(sidebarTab === 'databases')
+  /** @typedef {'tables' | 'databases' | 'recent'} ListTab */
+  /** @type {ListTab[]} */
+  const LIST_TABS = ['tables', 'databases', 'recent']
   // Nothing collapses any more, so every list in the open tab is open.
   const recentOpen = true, tablesOpen = true
   // The engine's own schemas (`pg_catalog`, `information_schema`, `sys`…) are
@@ -1151,8 +1174,33 @@
     sortDir = 'asc';
   }
   // ── Lists (tables, views, materialized views, databases) ─────────────────
-  /** @type {HTMLElement | null} */
-  let scrollContainerEl = $state(null)
+  /** Each list tab's scroller. @type {Record<ListTab, HTMLElement | null>} */
+  let listScrollers = $state({ tables: null, databases: null, recent: null })
+  /** The open list tab's scroller, null on the other tabs: every row query
+   *  (listRowButtons, the pin anchor) stays inside what is on screen. */
+  const scrollContainerEl = $derived(
+    /** @type {Record<string, HTMLElement | null>} */ (listScrollers)[activePanel] ?? null,
+  )
+
+  // A display:none scroller loses its offset, so each list puts its own back.
+  // Below the declarations on purpose: $effect.pre runs the moment it is
+  // created, so above them the reads hit the TDZ and threw on mount.
+  /** @type {Record<string, number>} */
+  const listScroll = {}
+  let lastPanel = untrack(() => activePanel)
+  $effect.pre(() => {
+    const p = activePanel
+    untrack(() => {
+      const el = /** @type {Record<string, HTMLElement | null>} */ (listScrollers)[lastPanel]
+      if (lastPanel !== p && el) listScroll[lastPanel] = el.scrollTop
+      lastPanel = p
+    })
+  })
+  $effect(() => {
+    const el = scrollContainerEl
+    const at = untrack(() => listScroll[activePanel])
+    if (el && at && el.scrollTop !== at) el.scrollTop = at
+  })
 
   // No windowing, and no `content-visibility` either. The sidebar renders every
   // row, plainly.
@@ -1310,7 +1358,9 @@
                   // row's own bottom edge. It was a 28px pill with the rail pushed
                   // 7px below it, so the rail floated in the gap between the pill and
                   // the border, attached to neither.
-                  "group/tab relative inline-flex h-9 w-8 shrink-0 items-center justify-center transition-colors disabled:pointer-events-none disabled:opacity-40",
+                  // No colour transition: the rail snaps on the switch, so a fading
+                  // pill and icon left two tabs half-lit for 150ms on every change.
+                  "group/tab relative inline-flex h-9 w-8 shrink-0 items-center justify-center disabled:pointer-events-none disabled:opacity-40",
                   // Two cues, not one. Colour alone does not separate four line icons
                   // at this size, so the selected tab also carries a filled surface and
                   // an accent rail - the same "which panel am I in" signal the VS Code
@@ -1326,10 +1376,11 @@
                   kbdNav = true
                   const i = SIDEBAR_TABS.findIndex((t) => t.id === sidebarTab)
                   const next = (i + (e.key === "ArrowRight" ? 1 : -1) + SIDEBAR_TABS.length) % SIDEBAR_TABS.length
+                  // Read before assigning: a statement starting with `(` here was
+                  // parsed as a call on the line above, so arrows threw and never moved.
+                  const btn = e.currentTarget.parentElement?.children[next]
                   sidebarTab = SIDEBAR_TABS[next].id
-                  /** @type {HTMLElement | null} */ (
-                    e.currentTarget.parentElement?.children[next] ?? null
-                  )?.focus()
+                  if (btn instanceof HTMLElement) btn.focus()
                 }}
               >
                 <!-- The pill is a child, not the button's own background: the
@@ -1337,7 +1388,7 @@
                      the shape you see stays 28px and centred. -->
                 <span
                   class={cn(
-                    "pointer-events-none absolute inset-x-0.5 inset-y-1 rounded-md transition-colors",
+                    "pointer-events-none absolute inset-x-0.5 inset-y-1 rounded-md",
                     active ? "bg-sidebar-accent" : "group-hover/tab:bg-sidebar-accent/50",
                   )}
                   aria-hidden="true"
@@ -1355,7 +1406,9 @@
           <div class="ml-auto flex shrink-0 items-center gap-0.5">
           {#if sidebarTab === 'objects'}
             <!-- On Objects the bar's refresh and + act on objects, so the list
-                 needs no header row of its own. -->
+                 needs no header row of its own. The spacer holds the display
+                 options' slot, so the group keeps its width across tabs. -->
+            <span class="invisible size-7 shrink-0" aria-hidden="true"></span>
             <button
               type="button"
               class="inline-flex size-7 shrink-0 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-foreground disabled:opacity-40"
@@ -1385,6 +1438,10 @@
               </DropdownMenu.Content>
             </DropdownMenu.Root>
           {:else}
+          <!-- These act on the table list only. On Queries and Find & replace
+               they did nothing for the panel below, so they keep their space
+               there (no shift between tabs) but are not shown or reachable. -->
+          <div class={cn("flex items-center gap-0.5", (sidebarTab === 'queries' || sidebarTab === 'search') && "invisible")}>
           <DropdownMenu.Root>
             <DropdownMenu.Trigger
               class="inline-flex size-7 shrink-0 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-foreground data-[state=open]:bg-accent data-[state=open]:text-foreground disabled:pointer-events-none disabled:opacity-40"
@@ -1509,6 +1566,7 @@
               <Icon name="plus" class="size-3.5" />
             </button>
           {/if}
+          </div>
           {/if}
           </div>
         </div>
@@ -1677,13 +1735,19 @@
         {/if}
       </div>
 
-      {#if sidebarTab === 'queries'}
-        {@render queriesPanel?.()}
-      {:else if sidebarTab === 'objects'}
-        {#if connectionName}
+      <!-- `contents` keeps each wrapper out of the flex layout, so a panel sits
+           in the column exactly as it did unwrapped; `hidden` parks it. -->
+      {#if panelMounted('queries')}
+        <div class={activePanel === 'queries' ? 'contents' : 'hidden'}>
+          {@render queriesPanel?.()}
+        </div>
+      {/if}
+      {#if connectionName && panelMounted('objects')}
+        <div class={activePanel === 'objects' ? 'contents' : 'hidden'}>
           <SidebarObjects
             bind:this={objectsPanel}
             bind:busyLoading={objectsLoading}
+            panelActive={activePanel === 'objects'}
             {connection}
             schema={activeSchema}
             {views}
@@ -1700,10 +1764,16 @@
             bind:total={objectsTotal}
             bind:shown={objectsShown}
           />
-        {/if}
-      {:else if sidebarTab === 'search'}
+        </div>
+      {/if}
+      {#if activePanel === 'search'}
         <FindReplacePanel
           bind:focusFind={focusFindField}
+          bind:findText={frFind}
+          bind:replaceText={frReplace}
+          bind:useRegex={frRegex}
+          bind:wholeValue={frWhole}
+          bind:caseSensitive={frCase}
           columns={frColumns}
           rows={frRows}
           primaryKey={frPrimaryKey}
@@ -1712,10 +1782,12 @@
           onapply={onfindreplaceapply}
           onreveal={onrevealcell}
         />
-      {:else}
-      <div class="flex min-h-0 flex-1 flex-col">
+      {/if}
+      <!-- One mounted panel per list tab, each with its own scroller: a shared
+           one re-rendered every row on each return to Tables. -->
+      {#snippet listPanel(/** @type {ListTab} */ lt)}
         <div
-          bind:this={scrollContainerEl}
+          bind:this={listScrollers[lt]}
           class="app-scroll min-h-0 w-full flex-1 overflow-y-auto overscroll-y-contain [will-change:scroll-position]"
           role="none"
           use:smoothScroll={{ enabled: !$appNativeScroll }}
@@ -1808,12 +1880,12 @@
                  Other databases on the same server. Collapsed by default and
                  only fetched once expanded - see loadDatabases(). Engines that
                  cannot switch in place (SQLite, Redis) never render it. -->
-            <!-- `!tabIsEmpty`: with nothing to list, the tab-level empty state
+            <!-- `!isTabEmpty(lt)`: with nothing to list, the tab-level empty state
                  below already says so in the middle of the panel. Rendering the
                  section as well put a second, quieter "No other databases" at the
                  top-left of the same empty panel - two answers to one question,
                  in two different places and two different type sizes. -->
-            {#if showDatabases && canSwitchDb && connectionName && !tabIsEmpty}
+            {#if lt === 'databases' && canSwitchDb && connectionName && !isTabEmpty(lt)}
               <div class="flex w-full items-center gap-1 px-2.5 pt-2 pb-1">
                 <span class="text-ui-2xs font-medium tracking-wider text-muted-foreground uppercase">Databases</span>
                 {#if dbEntries.length > 0}
@@ -1845,7 +1917,7 @@
                   </button>
                 </div>
               </div>
-              {#if databasesOpen}
+              {#if lt === 'databases'}
                 {#if dbEntriesLoading && dbEntries.length === 0}
                   {@render listLoading('Loading databases')}
                 {:else if dbEntriesError && dbEntries.length === 0}
@@ -1943,7 +2015,7 @@
             {/if}
 
             <!-- ── Recent ─────────────────────────────────────────── -->
-            {#if showRecent && filteredRecent.length > 0 && connectionName}
+            {#if lt === 'recent' && filteredRecent.length > 0 && connectionName}
               <div class="flex w-full items-center gap-1 px-2.5 pt-2 pb-1">
                 <span class="text-ui-2xs font-medium tracking-wider text-muted-foreground uppercase">Recent</span>
                 {@render countBadge(Math.min(filteredRecent.length, 5), Math.min(recentTabs.length, 5))}
@@ -2022,7 +2094,7 @@
             {/if}
 
             <!-- ── Pinned ─────────────────────────────────────────── -->
-            {#if showPins && filteredPinnedTables.length > 0 && connectionName}
+            {#if lt === 'tables' && filteredPinnedTables.length > 0 && connectionName}
               <!-- `pb-1.5`, because the action row is 20px tall now and 4px of
                    air put it on top of the first pin. -->
               <div class="flex w-full items-center gap-1.5 px-2.5 pt-2 pb-1.5">
@@ -2223,10 +2295,10 @@
             {/if}
 
             <!-- ── Tables ─────────────────────────────────────────── -->
-            <!-- `!tabIsEmpty` here and on Views / Materialized views, for the
+            <!-- `!isTabEmpty(lt)` here and on Views / Materialized views, for the
                  reason given on Databases above: an empty tab gets exactly one
                  empty state, the tab-level one below. -->
-            {#if showTables && !tabIsEmpty}
+            {#if lt === 'tables' && !isTabEmpty(lt)}
               <!-- Outside `tablesOpen`, like every other section header: a
                    collapsed list still has to say what it is and how much it is
                    hiding. `regularTablesUnpinned` is the denominator because
@@ -2464,32 +2536,32 @@
             {/if}
 
             <!-- ── Empty state, one per tab ──────────────────────── -->
-            {#if tabIsEmpty}
-              {@const empty = TAB_EMPTY[sidebarTab]}
+            {#if isTabEmpty(lt)}
+              {@const empty = TAB_EMPTY[lt]}
               <div class="flex flex-1 flex-col items-center justify-center gap-3 px-6 py-16 text-center">
                 <div class="flex size-10 items-center justify-center rounded-lg border border-border bg-muted/30">
-                  <Icon name={tabEmptyFromFilter ? 'search' : empty.icon} class="size-5 text-muted-foreground" />
+                  <Icon name={isTabEmptyFromFilter(lt) ? 'search' : empty.icon} class="size-5 text-muted-foreground" />
                 </div>
                 <div class="max-w-[16rem]">
                   <p class="text-ui-xs font-medium text-foreground">
-                    {tabEmptyFromFilter ? 'No matches' : empty.title}
+                    {isTabEmptyFromFilter(lt) ? 'No matches' : empty.title}
                   </p>
                   <p class="mt-1 text-ui-2xs leading-relaxed text-muted-foreground">
-                    {#if tabEmptyFromFilter}
+                    {#if isTabEmptyFromFilter(lt)}
                       Nothing here matches “{debouncedFilter}”.
-                    {:else if sidebarTab === 'tables' && activeSchema}
+                    {:else if lt === 'tables' && activeSchema}
                       Nothing in “{activeSchema}” yet.
                     {:else}
                       {empty.hint}
                     {/if}
                   </p>
                 </div>
-                {#if tabEmptyFromFilter}
+                {#if isTabEmptyFromFilter(lt)}
                   <Button variant="outline" size="sm" onclick={() => handleFilterInput('')}>
                     <Icon name="x" class="size-3.5" />
                     Clear filter
                   </Button>
-                {:else if sidebarTab === 'databases'}
+                {:else if lt === 'databases'}
                   <!-- The section header is not rendered in this state, so its
                        two actions live here instead of being unreachable. -->
                   <div class="flex items-center gap-2">
@@ -2510,7 +2582,7 @@
                       </Button>
                     {/if}
                   </div>
-                {:else if sidebarTab === 'tables'}
+                {:else if lt === 'tables'}
                   <Button variant="outline" size="sm" onclick={onrefresh}>
                     <Icon name="refresh-cw" class="size-3.5" />
                     Refresh
@@ -2523,8 +2595,14 @@
           {/if}
 
         </div>
-      </div>
-      {/if}
+      {/snippet}
+      {#each LIST_TABS as lt (lt)}
+        {#if panelMounted(lt)}
+          <div class={activePanel === lt ? 'flex min-h-0 flex-1 flex-col' : 'hidden'}>
+            {@render listPanel(lt)}
+          </div>
+        {/if}
+      {/each}
     </div>
     {:else if navSidebarPanel === "connections"}
       <ConnectionsSidebarPanel
diff --git a/src/lib/components/SidebarObjects.svelte b/src/lib/components/SidebarObjects.svelte
index e7ce696f..2e9fc0c8 100644
--- a/src/lib/components/SidebarObjects.svelte
+++ b/src/lib/components/SidebarObjects.svelte
@@ -74,6 +74,9 @@
     shown = $bindable(0),
     /** True while a listing loads, for the sidebar bar's refresh spinner. */
     busyLoading = $bindable(false),
+    /** False while another sidebar tab is up: the panel stays mounted, hidden,
+     *  and reads nothing until it is shown again. */
+    panelActive = true,
   } = $props()
 
   const family = $derived(objectFamily(connection?.type))
@@ -103,6 +106,7 @@
   $effect(() => {
     const key = placeKey
     const version = $objectsVersion
+    if (!panelActive) return
     untrack(() => void load(key, version))
   })
 
@@ -198,7 +202,9 @@
     const measure = () => {
       const h = probe?.getBoundingClientRect().height
       if (h && h > 0) rowH = h
-      if (scroller) viewH = scroller.clientHeight
+      // Hidden (another tab is up) measures 0: keep the last real height, or
+      // the window would render a handful of rows and fill in after the switch.
+      if (scroller && scroller.clientHeight > 0) viewH = scroller.clientHeight
     }
     measure()
     const ro = new ResizeObserver(measure)
@@ -216,6 +222,16 @@
     }
   })
 
+  // Shown again after another tab: display:none dropped the scroll offset.
+  $effect(() => {
+    if (!panelActive || !scroller) return
+    const at = untrack(() => scrolled.get(placeKey))
+    if (at && scroller.scrollTop !== at) {
+      scroller.scrollTop = at
+      scrollTop = scroller.scrollTop
+    }
+  })
+
   // ── Focus, selection, keyboard ──────────────────────────────────────────
   /** The active row: the one clicked or arrowed to. Kept by key, so it survives a refresh. */
   let active = $state('')
@@ -487,7 +503,7 @@
     <!-- Nothing at all in the schema: one place to start from. -->
     <div class="flex flex-col items-center gap-3 px-6 py-14 text-center">
       <div class="flex size-10 items-center justify-center rounded-lg border border-border bg-muted/30">
-        <Icon name="blocks" class="size-5 text-muted-foreground" />
+        <Icon name="shapes" class="size-5 text-muted-foreground" />
       </div>
       <p class="max-w-[16rem] text-ui-xs font-medium text-foreground">No views or routines in “{schema}”</p>
       {#if family}{@render newMenu('empty')}{/if}
diff --git a/src/lib/components/StatusBar.svelte b/src/lib/components/StatusBar.svelte
index 16d55d87..3b780f1d 100644
--- a/src/lib/components/StatusBar.svelte
+++ b/src/lib/components/StatusBar.svelte
@@ -632,14 +632,14 @@
           <button type="button" class={iconBtn} onclick={onscrolltablebottom} title={`Go to bottom (${comboTitle('Mod+Down')})`} aria-label="Scroll to bottom">
             <Icon name="chevrons-down" class="size-3.5" />
           </button>
-          {#if canScrollTableHorizontally}
-            <button type="button" class={iconBtn} onclick={onscrolltableleft} title={`Go to first column (${comboTitle('Mod+Alt+Left')})`} aria-label="Scroll to leftmost column">
-              <Icon name="chevrons-left" class="size-3.5" />
-            </button>
-            <button type="button" class={iconBtn} onclick={onscrolltableright} title={`Go to last column (${comboTitle('Mod+Alt+Right')})`} aria-label="Scroll to rightmost column">
-              <Icon name="chevrons-right" class="size-3.5" />
-            </button>
-          {/if}
+          <!-- Disabled rather than removed when the grid fits: dropping them
+               shifted everything to their right on every table open. -->
+          <button type="button" class={cn(iconBtn, 'disabled:pointer-events-none disabled:opacity-40')} disabled={!canScrollTableHorizontally} onclick={onscrolltableleft} title={`Go to first column (${comboTitle('Mod+Alt+Left')})`} aria-label="Scroll to leftmost column">
+            <Icon name="chevrons-left" class="size-3.5" />
+          </button>
+          <button type="button" class={cn(iconBtn, 'disabled:pointer-events-none disabled:opacity-40')} disabled={!canScrollTableHorizontally} onclick={onscrolltableright} title={`Go to last column (${comboTitle('Mod+Alt+Right')})`} aria-label="Scroll to rightmost column">
+            <Icon name="chevrons-right" class="size-3.5" />
+          </button>
         </div>
       {/if}
 
@@ -669,12 +669,14 @@
       {/if}
 
       <!-- Last fetch timing, updates on every table load / refresh / query -->
-      {#if queryMs > 0}
+      {#if showTableNav || queryMs > 0}
         {@render sep()}
+        <!-- A fixed slot on table tabs: it held its place only while a time was
+             known, so it vanished and came back around every table open. -->
         <span
-          class="shrink-0 px-1 font-mono text-ui-2xs tabular-nums text-muted-foreground"
-          title="Last data fetch took {queryMs.toLocaleString('en-US')}ms"
-        >{queryMsLabel}</span>
+          class="min-w-[6ch] shrink-0 px-1 font-mono text-ui-2xs tabular-nums text-muted-foreground"
+          title={queryMs > 0 ? `Last data fetch took ${queryMs.toLocaleString('en-US')}ms` : undefined}
+        >{queryMs > 0 ? queryMsLabel : ''}</span>
       {/if}
 
       <!-- Selected row count, sits to the right of the fetch timing -->
diff --git a/src/lib/components/StudioShell.svelte b/src/lib/components/StudioShell.svelte
index f5f39c84..070eeea6 100644
--- a/src/lib/components/StudioShell.svelte
+++ b/src/lib/components/StudioShell.svelte
@@ -2426,9 +2426,10 @@ let rowSearch = $state('')
         activeSchema = raw.schema
         await loadTables()
       }
-      if (raw.columns.length === 0) {
+      if (raw.columns.length === 0 || raw.evicted) {
         // No cached data - apply lightweight snapshot (no need to clone rows)
         if (windowed) resetWindowing()
+        if (raw.evicted) patchTableTab(tab.id, { evicted: false })
         applyTableSnapshot(raw, tab.id)
         // A fetch this tab already has in flight (including a windowed loadRows
         // it started before you left) keeps running and lands here on its own -
@@ -4017,7 +4018,10 @@ let rowSearch = $state('')
       const st = /** @type {TableTabState} */ (t.state)
       // windowedHead cleared too: with the array gone the tab has to refetch, and
       // the restore path must not look for a cache that no longer exists.
-      return { ...t, state: { ...st, rows: [], columns: [], selected: new Set(), windowedHead: false, windowedLoaded: [], windowCount: 0, loadingRows: false } }
+      // Only the rows go. Columns and total stay, so coming back draws the header
+      // and the toolbar at once and refetches the body, instead of a cold load
+      // that collapsed the pager and covered the grid.
+      return { ...t, state: { ...st, rows: [], selected: new Set(), windowedHead: false, windowedLoaded: [], windowCount: 0, loadingRows: false, evicted: true } }
     })
   }
 
@@ -4049,6 +4053,27 @@ let rowSearch = $state('')
     return true
   }
 
+  /**
+   * The batch version of confirmDiscardTabChanges: one confirm covers every
+   * unsaved change in the tabs about to close, and a yes discards them all.
+   * @param {any[]} closing
+   */
+  async function confirmDiscardManyTabChanges(closing) {
+    const count = closing.reduce((n, t) => n + tabPendingCount(t), 0)
+    if (count === 0) return true
+    const ok = await askConfirm(
+      `Closing these tabs discards ${count} unsaved change${count === 1 ? '' : 's'}. Close and discard?`,
+      'Close & discard',
+    )
+    if (!ok) return false
+    for (const t of closing) {
+      if (t.id === activeTabId) resetEdits()
+      const key = tabTableKey(t)
+      if (key) clearPendingChanges(key)
+    }
+    return true
+  }
+
   /** @param {string} id */
   async function closeTab(id) {
     const idx = tabs.findIndex((t) => t.id === id)
@@ -4124,12 +4149,14 @@ let rowSearch = $state('')
   async function closeOtherTabs(id) {
     const keep = tabs.find((t) => t.id === id)
     if (!keep) return
+    if (!(await confirmDiscardManyTabChanges(tabs.filter((t) => t.id !== id && !t.pinned)))) return
     for (const t of tabs) if (t.id !== id && !t.pinned) rememberClosedTab(t)
     tabs = tabs.filter((t) => t.id === id || t.pinned)
     await activateTab(keep.id)
   }
 
   async function closeAllTabs() {
+    if (!(await confirmDiscardManyTabChanges(tabs.filter((t) => !t.pinned)))) return
     const pinned = tabs.filter((t) => t.pinned)
     for (const t of tabs) if (!t.pinned) rememberClosedTab(t)
     if (pinned.length === 0) {
@@ -4152,18 +4179,7 @@ let rowSearch = $state('')
     const idSet = new Set(ids)
     const toClose = tabs.filter((t) => idSet.has(t.id) && !t.pinned)
     if (toClose.length === 0) return
-    const pending = toClose.reduce((n, t) => n + tabPendingCount(t), 0)
-    if (pending > 0) {
-      const ok = await askConfirm(
-        `Closing these tabs discards ${pending} unsaved change${pending === 1 ? '' : 's'}. Close and discard?`,
-        'Close & discard',
-      )
-      if (!ok) return
-      for (const t of toClose) {
-        const key = tabTableKey(t)
-        if (key) clearPendingChanges(key)
-      }
-    }
+    if (!(await confirmDiscardManyTabChanges(toClose))) return
     const closeSet = new Set(toClose.map((t) => t.id))
     for (const t of toClose) rememberClosedTab(t)
     const wasActiveClosed = activeTabId !== null && closeSet.has(activeTabId)
@@ -4492,8 +4508,10 @@ let rowSearch = $state('')
     primaryKey = []
     foreignKeys = []
     rows = []
-    total = 0
-    queryMs = 0
+    // -1 is "counting": the toolbar keeps its pager shape from the first frame
+    // instead of collapsing while the rows load. queryMs keeps the last fetch's
+    // time until this one lands, so the status bar doesn't drop an item.
+    total = -1
     error = ''
     selected = new Set()
     focusedRow = null
@@ -4984,6 +5002,9 @@ let rowSearch = $state('')
   /** @param {{ force?: boolean }} [opts] */
   /** `quiet` re-lists without the loading state, so the sidebar keeps its rows,
    *  scroll and focus while a refresh after a write lands. */
+  /** Catalog key of the list in `tables`, so a refresh can tell it is re-reading the same one. */
+  let _tablesKey = ''
+
   async function loadTables({ force = false, quiet = false } = {}) {
     if (!activeSchema) {
       tables = []
@@ -4995,16 +5016,24 @@ let rowSearch = $state('')
     const schemaAtCall = activeSchema
     const connAtCall = persistConnectionId
     const key = catalogKey(persistConnectionId, 'tables', schemaAtCall)
+    // Re-reading the list already on screen (a refresh) keeps it up and keeps the
+    // counts it knows. Swapping it for loading dots reset the sidebar's scroll
+    // and blanked every count until the recount waves came back.
+    const sameList = tables.length > 0 && _tablesKey === key
+    const prevCounts = sameList ? new Map(tables.map((t) => [t.name, t.rowCount])) : null
+    /** Tables whose count the reply left unknown: recounted even when a known one is kept. */
+    let replyUnknown = /** @type {string[] | null} */ (null)
     if (force) invalidateCatalog()
     const cached = force ? undefined : /** @type {any[] | undefined} */ (_catalog.get(key, TABLE_LIST_TTL_MS))
     if (cached) {
       tables = cached
+      _tablesKey = key
       loadingTables = false
       if (activeTable && !tables.find((t) => t.name === activeTable)) {
         activeTable = tables[0]?.name ?? null
       }
     } else {
-      if (!quiet) loadingTables = true
+      if (!quiet && !sameList) loadingTables = true
       error = ''
       try {
         const list = await listTables(schemaAtCall)
@@ -5013,17 +5042,24 @@ let rowSearch = $state('')
         // _catalog.set below would file them under whichever connection id is
         // current - poisoning that connection's cache for the whole TTL.
         if (connectionMoved(connAtCall)) return
+        replyUnknown = []
         tables = list
-          .map((t) => ({
-            name: t.name ?? t.table_name ?? '',
-            rowCount: normalizeTableRowCount(t.rowCount ?? t.row_count),
-            kind: t.kind ?? 'table',
-            rlsEnabled: t.rlsEnabled ?? null,
-            // For the sidebar's Created sort (see compareCreated).
-            createdAt: t.createdAt ?? null,
-            createOrder: t.createOrder ?? null,
-          }))
+          .map((t) => {
+            const name = t.name ?? t.table_name ?? ''
+            const fresh = normalizeTableRowCount(t.rowCount ?? t.row_count)
+            if (fresh === null) replyUnknown?.push(name)
+            return {
+              name,
+              rowCount: fresh ?? prevCounts?.get(name) ?? null,
+              kind: t.kind ?? 'table',
+              rlsEnabled: t.rlsEnabled ?? null,
+              // For the sidebar's Created sort (see compareCreated).
+              createdAt: t.createdAt ?? null,
+              createOrder: t.createOrder ?? null,
+            }
+          })
           .filter((t) => t.name)
+        _tablesKey = key
         _catalog.set(key, tables)
         if (activeTable && !tables.find((t) => t.name === activeTable)) {
           activeTable = tables[0]?.name ?? null
@@ -5041,7 +5077,7 @@ let rowSearch = $state('')
     // The list arrives with unknown (null) counts so it renders immediately;
     // resolve them with exact COUNT(*)s in the background and patch them in.
     // Covers the cached path too - a list cached mid-resolve may still hold nulls.
-    const unresolved = tables.filter((t) => t.rowCount === null).map((t) => t.name)
+    const unresolved = replyUnknown ?? tables.filter((t) => t.rowCount === null).map((t) => t.name)
     if (unresolved.length > 0) void resolveRowCounts(key, schemaAtCall, unresolved)
     // The schema-level catalog rides the same cache, so returning to a schema
     // costs nothing. A forced reload has already invalidated it above.
@@ -5131,6 +5167,20 @@ let rowSearch = $state('')
     }, SEARCH_DEBOUNCE_MS)
   }
 
+  /** Drop the row search and every filter at once (the grid's "Clear filters"). */
+  function clearRowFilters() {
+    if (searchDebounceTimer) clearTimeout(searchDebounceTimer)
+    if (filterDebounceTimer) clearTimeout(filterDebounceTimer)
+    searchDebounceTimer = null
+    filterDebounceTimer = null
+    rowSearch = ''
+    rowFilters = []
+    page = 1
+    rawOffset = null
+    _keysetCursor = null
+    void loadRows()
+  }
+
   /** @param {TableSort[]} sorts full ordered sort-key list ([] clears; [primary, …secondary]) */
   async function handleRowSortChange(sorts) {
     const list = Array.isArray(sorts) ? sorts.filter((s) => s?.column) : (sorts ? [sorts] : [])
@@ -5374,6 +5424,11 @@ let rowSearch = $state('')
         } catch { /* keep the empty result; the grid shows its empty state */ }
       }
 
+      // A tab that already knew its count (evicted while cold, or restored) keeps
+      // it until the background count lands, rather than flashing "…". The state
+      // saves total and filters together, so the number is for this predicate.
+      if (result.total < 0 && s.total > 0) result.total = s.total
+
       // Persist result to tab - one tabs write
       patchTab(result)
 
@@ -5415,6 +5470,9 @@ let rowSearch = $state('')
             if (tabId === activeTabId) {
               total = n
               _totalSig = predicateSig(apiSearch(s.rowSearch), s.rowFilters ?? [])
+              // Recorded like refreshRowCount does, or the first page change
+              // after opening counted again and flashed "…" while it did.
+              _countedView = rowCountKey(s.schema, s.table, _totalSig)
             }
           }
         } catch { /* best-effort */ }
@@ -6034,7 +6092,11 @@ let rowSearch = $state('')
         // would blank the total and force the COUNT(*) the skip below exists to
         // avoid, and the footer would flicker through "counting" on each page.
         const incoming = Number(data.total ?? 0)
-        total = incoming >= 0 ? incoming : (_countedView === viewKey ? total : incoming)
+        // A recount of the same table under the same predicate (a refresh, or
+        // coming back to a tab) shows the last number until the new one lands,
+        // not "…": `total` and `_totalSig` here are this tab's, restored with it.
+        const sameView = _countedView === viewKey || (total > 0 && _totalSig === ownerSig)
+        total = incoming >= 0 ? incoming : (sameView ? total : incoming)
         _totalSig = ownerSig
       }
       queryMs = ranMs
@@ -6910,19 +6972,30 @@ let rowSearch = $state('')
     if (connectionLost) await reconnectPool()
     activeSchema = schema
     setLastSchema(persistConnectionId, schema)
-    activeTable = null
     page = 1
     tableFilter = ''
-    columns = []
-    rows = []
+    // The open table stays on screen while the new schema's list loads, then
+    // swaps in one step under the grid's held frame. Blanking it first showed
+    // the "select a table" screen, then the old toolbar over an empty grid.
     await loadTables()
-    if (activeTab?.kind === 'table') {
-      if (tables.length) {
-        activeTable = tables[0].name
-        await loadRows()
-      } else {
-        saveActiveTabState()
-      }
+    if (activeTab?.kind === 'table' && tables.length) {
+      activeTable = tables[0].name
+      // The old table's search, filters and sort mean nothing on this one.
+      rowSearch = ''
+      rowFilters = []
+      rowSort = null
+      rowSortMore = []
+      filterBarOpen = false
+      columns = []
+      rows = []
+      total = -1
+      saveActiveTabState()
+      await loadRows()
+    } else {
+      activeTable = null
+      columns = []
+      rows = []
+      if (activeTab?.kind === 'table') saveActiveTabState()
     }
   }
 
@@ -8254,9 +8327,12 @@ let rowSearch = $state('')
     <!-- The ring and the label wait before they appear (ConnectOverlay's
          `delay`). A warm reconnect lands in a few hundred ms, and showing them
          at once flashed "Reconnecting" over the shell on a cold start. -->
+    <!-- The hold-back is for the startup reconnect only. A switch you asked for
+         unmounts the shell at once, so held back it was ~350ms of bare black. -->
     <ConnectOverlay
       verb={autoConnectVerb}
       name={autoConnectName ? shortConnLabel(autoConnectName) : ''}
+      delay={autoConnectVerb === 'Reconnecting' ? 350 : 0}
       oncancel={() => void cancelAutoConnect()}
     />
   </div>
@@ -9227,6 +9303,7 @@ let rowSearch = $state('')
             {pageSize}
             offset={currentOffset}
             {total}
+            loaded={rows.length}
             {columns}
             {rowSearch}
             {rowSort}
@@ -9338,6 +9415,8 @@ let rowSearch = $state('')
                 {loadingMore}
                 {infiniteScroll}
                 endOfResults={infiniteScroll && !windowed && total > 0 && rows.length >= total}
+                filtered={rowSearch.trim() !== '' || activeFilters(rowFilters).length > 0}
+                onclearfilters={clearRowFilters}
                 onloadmore={handleLoadMore}
                 saving={savingCell || deletingRows || insertingRow}
                 bind:selected
diff --git a/src/lib/components/TabBar.svelte b/src/lib/components/TabBar.svelte
index 038f361d..1b11baf3 100644
--- a/src/lib/components/TabBar.svelte
+++ b/src/lib/components/TabBar.svelte
@@ -265,8 +265,8 @@
             <ContextMenu.Shortcut combo="Mod+Shift+T" />
           </ContextMenu.Item>
           <ContextMenu.Separator />
-          <ContextMenu.Item variant="destructive" onSelect={oncloseall}>
-            <Icon name="trash-2" class="size-3.5" />
+          <ContextMenu.Item onSelect={oncloseall}>
+            <Icon name="x" class="size-3.5" />
             Close All Tabs
             <ContextMenu.Shortcut combo="Mod+Shift+W" />
           </ContextMenu.Item>
diff --git a/src/lib/components/TableToolbar.svelte b/src/lib/components/TableToolbar.svelte
index c781f75f..bab33541 100644
--- a/src/lib/components/TableToolbar.svelte
+++ b/src/lib/components/TableToolbar.svelte
@@ -61,6 +61,8 @@
     page = 1,
     pageSize = 50,
     total = 0,
+    /** Rows currently loaded, for the range readout under page size All. */
+    loaded = 0,
     loading = false,
     selectedCount = 0,
     hasPrimaryKey = false,
@@ -215,7 +217,7 @@
    */
   const searchHintCaps = $derived(keycaps('Mod+F'));
   const searchHint = $derived(
-    tableViewMode !== 'structure' && !searchFocused && !localSearch && columns.length > 0,
+    tableViewMode !== 'structure' && !searchFocused && !localSearch,
   );
   /**
    * The toggles sit in the field's trailing corner, and only once there is
@@ -285,8 +287,15 @@
   // row data has already loaded). Show "…" for the unknown total and keep Next
   // enabled so navigation isn't blocked during the brief counting window.
   const counting = $derived(total < 0);
+  const isAll = $derived(pageSize === PAGE_SIZE_ALL);
   const from = $derived(total === 0 ? 0 : offset + 1);
-  const to = $derived(counting ? offset + _effectivePageSize : Math.min(offset + _effectivePageSize, total));
+  // Under All the page is whatever has loaded; the page size is 1 until the
+  // count lands, which read as "1-1 of …".
+  const to = $derived(
+    counting
+      ? offset + (isAll ? Math.max(1, loaded) : _effectivePageSize)
+      : Math.min(offset + _effectivePageSize, total),
+  );
   const pageCount = $derived(Math.max(1, Math.ceil(total / _effectivePageSize) || 1));
   const canPrev = $derived(page > 1);
   const canNext = $derived(keysetMode ? keysetHasMore : (counting || page * _effectivePageSize < total));
@@ -986,11 +995,11 @@
         type="button"
         class={cn(
           iconBtn,
-          "shrink-0",
-          filterCount > 0 ? "gap-1 !w-auto px-2" : "",
+          "relative shrink-0",
           (filterCount > 0 || filterBarOpen) && "bg-accent text-foreground",
         )}
         title="Filter rows ({KEY.filter})"
+        aria-label={filterCount > 0 ? `Filter rows, ${filterCount} active` : "Filter rows"}
         disabled={loading || columns.length === 0}
         onclick={() => {
           if (filterBarOpen) filterBarOpen = false;
@@ -998,8 +1007,10 @@
         }}
       >
         <Icon name="list-filter" class="size-3.5" />
+        <!-- A corner badge, not inline text: widening the button moved the five
+             buttons after it 14px every time a filter was typed or cleared. -->
         {#if filterCount > 0}
-          <span class="tabular-nums text-ui-2xs font-medium text-primary" aria-hidden="true">{formatCompactCount(filterCount)}</span>
+          <span class="pointer-events-none absolute -top-0.5 -right-0.5 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-primary px-0.5 text-ui-3xs font-medium tabular-nums text-primary-foreground" aria-hidden="true">{formatCompactCount(filterCount)}</span>
         {/if}
       </button>
 
@@ -1212,8 +1223,11 @@
         {/if}
       {:else}
         {#if total > 0 || counting}
+          <!-- A min-width box with the text held to its left: "…" becoming
+               "18,234" grows into the box instead of shoving the pager sideways
+               or sliding the range readout along with it. -->
           <span
-            class="flex shrink-0 items-center gap-1 font-mono text-ui-xs tabular-nums @max-[600px]/tb:hidden"
+            class="flex min-w-[18ch] shrink-0 items-center gap-1 font-mono text-ui-xs tabular-nums @max-[600px]/tb:hidden"
             title="{from.toLocaleString('en-US')}-{to.toLocaleString('en-US')} of {counting ? 'counting…' : total.toLocaleString('en-US') + ' rows'}{queryMs > 0 ? ` · ${queryMs}ms` : ''}"
           >
             <span class="text-foreground/65">{from.toLocaleString("en-US")}-{to.toLocaleString("en-US")}</span>
@@ -1273,12 +1287,15 @@
           >
             <Icon name="chevron-right" class="size-3.5" />
           </button>
-        {:else if counting || pageCount > 1}
+        {:else if !isAll}
+          <!-- Always present outside All, disabled on a single page: appearing
+               only for multi-page results moved the page-size select 179px
+               between tables. All never paginates, so it never shows. -->
           <Select.Root
             type="single"
             value={String(page)}
             onValueChange={(v) => { if (v) onpagechange(Number(v)); }}
-            disabled={loading || total === 0}
+            disabled={loading || total === 0 || (!counting && pageCount <= 1)}
           >
             <Select.Trigger size="sm" class={pageSelectTrigger} title="Go to page" aria-label="Go to page">
               {page}
@@ -1291,7 +1308,7 @@
           </Select.Root>
 
           <span
-            class="shrink-0 text-ui-xs text-muted-foreground tabular-nums @max-[500px]/tb:hidden"
+            class="min-w-[6ch] shrink-0 text-ui-xs text-muted-foreground tabular-nums @max-[500px]/tb:hidden"
             title={counting ? "counting…" : pageCount.toLocaleString("en-US")}
           >of {counting ? "…" : formatCompactCount(pageCount)}</span>
 
@@ -1621,7 +1638,9 @@
   </header>
 
   <!-- Inline filter bar -->
-  {#if filterBarOpen && columns.length > 0 && tableViewMode !== "structure"}
+  <!-- Kept up while a reload empties `columns`: dropping and remounting it
+       moved the grid 82px each way around every load. -->
+  {#if filterBarOpen && (columns.length > 0 || loading) && tableViewMode !== "structure"}
     <div class="studio-filter-bar border-b border-border/50 bg-panel">
       {#each rowFilters as filter, i (filter.id)}
         {@const colKind = getColKind(filter.column)}
diff --git a/src/lib/icon-registry-phosphor.js b/src/lib/icon-registry-phosphor.js
index d002588b..0c2879af 100644
--- a/src/lib/icon-registry-phosphor.js
+++ b/src/lib/icon-registry-phosphor.js
@@ -90,6 +90,7 @@ import PhFadersHorizontal from 'phosphor-svelte/lib/FadersHorizontal'
 import PhSquaresFour from 'phosphor-svelte/lib/SquaresFour'
 import PhStack from 'phosphor-svelte/lib/Stack'
 import PhPuzzlePiece from 'phosphor-svelte/lib/PuzzlePiece'
+import PhShapes from 'phosphor-svelte/lib/Shapes'
 import PhWifiHigh from 'phosphor-svelte/lib/WifiHigh'
 import PhWifiSlash from 'phosphor-svelte/lib/WifiSlash'
 import PhColumns from 'phosphor-svelte/lib/Columns'
@@ -187,6 +188,7 @@ export const PHOSPHOR_MAP = {
   'panel-left-open': PhSidebar,
   'layers': PhStack,
   'blocks': PhPuzzlePiece,
+  'shapes': PhShapes,
   'globe': PhGlobe,
   'wifi': PhWifiHigh,
   'wifi-off': PhWifiSlash,
diff --git a/src/lib/icon-registry.js b/src/lib/icon-registry.js
index 23dcc163..d8d3ed9a 100644
--- a/src/lib/icon-registry.js
+++ b/src/lib/icon-registry.js
@@ -121,6 +121,7 @@ import Hash from '@lucide/svelte/icons/hash'
 import Infinity from '@lucide/svelte/icons/infinity'
 import Keyboard from '@lucide/svelte/icons/keyboard'
 import Layers from '@lucide/svelte/icons/layers'
+import Shapes from '@lucide/svelte/icons/shapes'
 import LayoutList from '@lucide/svelte/icons/layout-list'
 import PanelLeftClose from '@lucide/svelte/icons/panel-left-close'
 import PanelLeftOpen from '@lucide/svelte/icons/panel-left-open'
@@ -169,6 +170,7 @@ import {
   LayoutThreeColumnIcon,
   SidebarLeftIcon, SidebarLeft01Icon,
   TextWrapIcon, LeftToRightListNumberIcon, FileDiffIcon,
+  Shapes01Icon, SearchReplaceIcon,
 } from '@hugeicons/core-free-icons'
 
 /** @type {Record<string, { lucide: any, huge?: any }>} */
@@ -254,6 +256,8 @@ export const ICON_MAP = {
   'share-2':        { lucide: Share2,        huge: Share08Icon },
   'git-compare':    { lucide: GitCompare,    huge: GitCompareIcon },
   'blocks':         { lucide: Blocks,        huge: PuzzleIcon },
+  // Database objects (views, routines, types): not 'blocks', which is Extensions.
+  'shapes':         { lucide: Shapes,        huge: Shapes01Icon },
   'globe':          { lucide: Globe,         huge: GlobalIcon },
   'plug':           { lucide: Plug,          huge: PlugSocketIcon },
   'notebook-pen':   { lucide: NotebookPen,   huge: NoteEditIcon },
@@ -266,7 +270,7 @@ export const ICON_MAP = {
   'arrow-down-to-line':{ lucide: ArrowDownToLine, huge: Download04Icon },
   'arrow-left-to-line':{ lucide: ArrowLeftToLine, huge: ArrowLeftDoubleIcon },
   'arrow-right-to-line':{ lucide: ArrowRightToLine, huge: ArrowRightDoubleIcon },
-  'replace':        { lucide: ReplaceLucide },
+  'replace':        { lucide: ReplaceLucide, huge: SearchReplaceIcon },
   'bookmark':       { lucide: Bookmark,       huge: Bookmark01Icon },
   'box':            { lucide: Box,            huge: PackageIcon },
   'bug':            { lucide: Bug,            huge: BugIcon },
diff --git a/src/lib/stores/plugins.js b/src/lib/stores/plugins.js
index 929fb107..ef68cd83 100644
--- a/src/lib/stores/plugins.js
+++ b/src/lib/stores/plugins.js
@@ -48,9 +48,10 @@ if (typeof window !== 'undefined') {
 /**
  * Extensions that ship enabled. Workflow features (saved views, find &
  * replace) are core-adjacent - off-by-default would just hide them; the
- * Extensions page stays the place to switch them off.
+ * Extensions page stays the place to switch them off. Nullish markers are on
+ * because without them a real NULL and the text 'NULL' differ only by colour.
  */
-const DEFAULT_ON = new Set(['saved-views', 'find-replace'])
+const DEFAULT_ON = new Set(['saved-views', 'find-replace', 'nullish-values'])
 
 /**
  * Enabled check against an explicit state snapshot (for reactive `$pluginState`
diff --git a/src/lib/studio-tabs.js b/src/lib/studio-tabs.js
index c7c5c8d4..e3fb0e76 100644
--- a/src/lib/studio-tabs.js
+++ b/src/lib/studio-tabs.js
@@ -45,6 +45,7 @@ import { loadDefaultPageSize } from '$lib/table-query.js'
  * @property {number} [windowBase] - absolute row offset the windowed view starts at
  * @property {number} [windowCount] - rows the windowed view covers
  * @property {number} [windowBytesPerRow] - measured payload per row
+ * @property {boolean} [evicted] - rows were dropped while the tab sat cold; columns and total were kept, so it refetches rows only
  * @property {{ sortColumn: string, sortDirection: string, sorts: Array<{column:string,direction:string}> } | null} [windowOrder] - the one total order every window of this view slices
  */