diff --git a/src-web/components/SidebarItem.tsx b/src-web/components/SidebarItem.tsx
index 4a148e91..d1417451 100644
--- a/src-web/components/SidebarItem.tsx
+++ b/src-web/components/SidebarItem.tsx
@@ -226,11 +226,13 @@ export const SidebarItem = memo(function SidebarItem({
   return (
     <li ref={ref} draggable>
       <div className={classNames(className, 'block relative group/item px-1.5 pb-0.5')}>
-        <SidebarItemContextMenu
-          child={child}
-          show={showContextMenu}
-          close={handleCloseContextMenu}
-        />
+        {showContextMenu && (
+          <SidebarItemContextMenu
+            child={child}
+            show={showContextMenu}
+            close={handleCloseContextMenu}
+          />
+        )}
         <button
           // tabIndex={-1} // Will prevent drag-n-drop
           disabled={editing}
diff --git a/src-web/components/core/Editor/Editor.tsx b/src-web/components/core/Editor/Editor.tsx
index 1eea239f..2b27e18a 100644
--- a/src-web/components/core/Editor/Editor.tsx
+++ b/src-web/components/core/Editor/Editor.tsx
@@ -33,7 +33,12 @@ import { TemplateVariableDialog } from '../../TemplateVariableDialog';
 import { IconButton } from '../IconButton';
 import { HStack } from '../Stacks';
 import './Editor.css';
-import { baseExtensions, getLanguageExtension, multiLineExtensions } from './extensions';
+import {
+  baseExtensions,
+  emptyExtension,
+  getLanguageExtension,
+  multiLineExtensions,
+} from './extensions';
 import type { GenericCompletionConfig } from './genericCompletion';
 import { singleLineExtensions } from './singleLine';
 
@@ -166,9 +171,8 @@ export const Editor = forwardRef<EditorView | undefined, EditorProps>(function E
   useEffect(
     function configurePlaceholder() {
       if (cm.current === null) return;
-      const effect = placeholderCompartment.current.reconfigure(
-        placeholderExt(placeholderElFromText(placeholder ?? '')),
-      );
+      const ext = placeholderExt(placeholderElFromText(placeholder ?? ''));
+      const effect = placeholderCompartment.current.reconfigure(ext);
       cm.current?.view.dispatch({ effects: effect });
     },
     [placeholder],
@@ -179,7 +183,12 @@ export const Editor = forwardRef<EditorView | undefined, EditorProps>(function E
   useEffect(
     function configureWrapLines() {
       if (cm.current === null) return;
-      const ext = wrapLines ? [EditorView.lineWrapping] : [];
+      const current = wrapLinesCompartment.current.get(cm.current.view.state) ?? emptyExtension;
+      // PERF: This is expensive with hundreds of editors on screen, so only do it when necessary
+      if (wrapLines && current !== emptyExtension) return; // Nothing to do
+      if (!wrapLines && current === emptyExtension) return; // Nothing to do
+
+      const ext = wrapLines ? EditorView.lineWrapping : emptyExtension;
       const effect = wrapLinesCompartment.current.reconfigure(ext);
       cm.current?.view.dispatch({ effects: effect });
     },
@@ -323,7 +332,7 @@ export const Editor = forwardRef<EditorView | undefined, EditorProps>(function E
           placeholderCompartment.current.of(
             placeholderExt(placeholderElFromText(placeholder ?? '')),
           ),
-          wrapLinesCompartment.current.of(wrapLines ? [EditorView.lineWrapping] : []),
+          wrapLinesCompartment.current.of(wrapLines ? EditorView.lineWrapping : emptyExtension),
           ...getExtensions({
             container,
             readOnly,
diff --git a/src-web/components/core/Editor/extensions.ts b/src-web/components/core/Editor/extensions.ts
index 22d5eb30..efab38b5 100644
--- a/src-web/components/core/Editor/extensions.ts
+++ b/src-web/components/core/Editor/extensions.ts
@@ -21,6 +21,7 @@ import {
 import { lintKeymap } from '@codemirror/lint';
 
 import { searchKeymap } from '@codemirror/search';
+import type { Extension } from '@codemirror/state';
 import { EditorState } from '@codemirror/state';
 import {
   crosshairCursor,
@@ -85,6 +86,8 @@ const syntaxExtensions: Record<NonNullable<EditorProps['language']>, LanguageSup
   markdown: markdown(),
 };
 
+export const emptyExtension: Extension = [];
+
 export function getLanguageExtension({
   language,
   useTemplating = false,
diff --git a/src-web/components/core/PairEditor.tsx b/src-web/components/core/PairEditor.tsx
index 1b911674..9c215de0 100644
--- a/src-web/components/core/PairEditor.tsx
+++ b/src-web/components/core/PairEditor.tsx
@@ -1,4 +1,3 @@
-import { deepEqual } from '@tanstack/react-router';
 import classNames from 'classnames';
 import type { EditorView } from 'codemirror';
 import {
@@ -14,9 +13,11 @@ import {
 import type { XYCoord } from 'react-dnd';
 import { useDrag, useDrop } from 'react-dnd';
 import { usePrompt } from '../../hooks/usePrompt';
+import { useToggle } from '../../hooks/useToggle';
 import { generateId } from '../../lib/generateId';
 import { DropMarker } from '../DropMarker';
 import { SelectFile } from '../SelectFile';
+import { Button } from './Button';
 import { Checkbox } from './Checkbox';
 import type { DropdownItem } from './Dropdown';
 import { Dropdown } from './Dropdown';
@@ -62,6 +63,9 @@ export type Pair = {
   readOnlyName?: boolean;
 };
 
+/** Max number of pairs to show before prompting the user to reveal the rest */
+const MAX_INITIAL_PAIRS = 50;
+
 export const PairEditor = forwardRef<PairEditorRef, PairEditorProps>(function PairEditor(
   {
     stateKey,
@@ -86,12 +90,8 @@ export const PairEditor = forwardRef<PairEditorRef, PairEditorProps>(function Pa
   const [forceFocusNamePairId, setForceFocusNamePairId] = useState<string | null>(null);
   const [forceFocusValuePairId, setForceFocusValuePairId] = useState<string | null>(null);
   const [hoveredIndex, setHoveredIndex] = useState<number | null>(null);
-  const [pairs, setPairs] = useState<Pair[]>(() => {
-    // Remove empty headers on initial render
-    const nonEmpty = originalPairs.filter((h) => !(h.name === '' && h.value === ''));
-    const pairs = nonEmpty.map((pair) => ensureValidPair(pair));
-    return [...pairs, ensureValidPair()];
-  });
+  const [pairs, setPairs] = useState<Pair[]>([]);
+  const [showAll, toggleShowAll] = useToggle(false);
 
   useImperativeHandle(
     ref,
@@ -105,17 +105,24 @@ export const PairEditor = forwardRef<PairEditorRef, PairEditorProps>(function Pa
   );
 
   useEffect(() => {
-    // Remove empty headers on initial render
-    // TODO: Make this not refresh the entire editor when forceUpdateKey changes, using some
-    //  sort of diff method or deterministic IDs based on array index and update key
-    const nonEmpty = originalPairs.filter(
-      (h, i) => i !== originalPairs.length - 1 && !(h.name === '' && h.value === ''),
-    );
-    const newPairs = nonEmpty.map((pair) => ensureValidPair(pair));
-    if (!deepEqual(pairs, newPairs)) {
-      setPairs(pairs);
+    // Remove empty headers on initial render and ensure they all have valid ids (pairs didn't used to have IDs)
+    const newPairs = [];
+    for (let i = 0; i < originalPairs.length; i++) {
+      const p = originalPairs[i];
+      if (!p) continue; // Make TS happy
+      if (isPairEmpty(p)) continue;
+      if (!p.id) p.id = generateId();
+      newPairs.push(p);
     }
 
+    // Add empty last pair if there is none
+    const lastPair = newPairs[newPairs.length - 1];
+    if (lastPair != null && !isPairEmpty(lastPair)) {
+      newPairs.push(emptyPair());
+    }
+
+    setPairs(newPairs);
+
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [forceUpdateKey]);
 
@@ -181,10 +188,9 @@ export const PairEditor = forwardRef<PairEditorRef, PairEditorProps>(function Pa
         setForceFocusValuePairId(null); // Remove focus override when something focused
         const isLast = pair.id === pairs[pairs.length - 1]?.id;
         if (isLast) {
-          const newPair = ensureValidPair();
           const prevPair = pairs[pairs.length - 1];
           setForceFocusNamePairId(prevPair?.id ?? null);
-          return [...pairs, newPair];
+          return [...pairs, emptyPair()];
         } else {
           return pairs;
         }
@@ -192,13 +198,6 @@ export const PairEditor = forwardRef<PairEditorRef, PairEditorProps>(function Pa
     [],
   );
 
-  // Ensure there's always at least one pair
-  useEffect(() => {
-    if (pairs.length === 0) {
-      setPairs((pairs) => [...pairs, ensureValidPair()]);
-    }
-  }, [pairs]);
-
   return (
     <div
       className={classNames(
@@ -213,6 +212,8 @@ export const PairEditor = forwardRef<PairEditorRef, PairEditorProps>(function Pa
       )}
     >
       {pairs.map((p, i) => {
+        if (!showAll && i > MAX_INITIAL_PAIRS) return null;
+
         const isLast = i === pairs.length - 1;
         return (
           <Fragment key={p.id}>
@@ -245,6 +246,17 @@ export const PairEditor = forwardRef<PairEditorRef, PairEditorProps>(function Pa
           </Fragment>
         );
       })}
+      {!showAll && pairs.length > MAX_INITIAL_PAIRS && (
+        <Button
+          onClick={toggleShowAll}
+          variant="border"
+          className="m-2"
+          size="xs"
+          event="pairs.reveal-more"
+        >
+          Show {pairs.length - MAX_INITIAL_PAIRS} More
+        </Button>
+      )}
     </div>
   );
 });
@@ -607,12 +619,15 @@ function FileActionsDropdown({
   );
 }
 
-function ensureValidPair(initialPair?: Pair): Pair {
+function emptyPair(): Pair {
   return {
-    name: initialPair?.name ?? '',
-    value: initialPair?.value ?? '',
-    enabled: initialPair?.enabled ?? true,
-    isFile: initialPair?.isFile ?? false,
-    id: initialPair?.id || generateId(),
+    enabled: true,
+    name: '',
+    value: '',
+    id: generateId(),
   };
 }
+
+function isPairEmpty(pair: Pair): boolean {
+  return !pair.name && !pair.value;
+}
diff --git a/src-web/hooks/useActiveEnvironmentVariables.ts b/src-web/hooks/useActiveEnvironmentVariables.ts
index 84c27b3d..cf6d45ac 100644
--- a/src-web/hooks/useActiveEnvironmentVariables.ts
+++ b/src-web/hooks/useActiveEnvironmentVariables.ts
@@ -1,24 +1,26 @@
 import type { EnvironmentVariable } from '@yaakapp-internal/models';
-import { useMemo } from 'react';
-import { useActiveEnvironment } from './useActiveEnvironment';
-import { useEnvironments } from './useEnvironments';
+import { atom, useAtomValue } from 'jotai';
+import { activeEnvironmentAtom } from './useActiveEnvironment';
+import { environmentsBreakdownAtom } from './useEnvironments';
+
+const activeEnvironmentVariablesAtom = atom((get) => {
+  const { baseEnvironment } = get(environmentsBreakdownAtom);
+  const activeEnvironment = get(activeEnvironmentAtom);
+
+  const varMap: Record<string, EnvironmentVariable> = {};
+  const allVariables = [
+    ...(baseEnvironment?.variables ?? []),
+    ...(activeEnvironment?.variables ?? []),
+  ];
+
+  for (const v of allVariables) {
+    if (!v.enabled || !v.name) continue;
+    varMap[v.name] = v;
+  }
+
+  return Object.values(varMap);
+});
 
 export function useActiveEnvironmentVariables() {
-  const { baseEnvironment } = useEnvironments();
-  const [environment] = useActiveEnvironment();
-
-  const variables = useMemo(() => {
-    const varMap: Record<string, EnvironmentVariable> = {};
-
-    const allVariables = [...(baseEnvironment?.variables ?? []), ...(environment?.variables ?? [])];
-
-    for (const v of allVariables) {
-      if (!v.enabled || !v.name) continue;
-      varMap[v.name] = v;
-    }
-
-    return Object.values(varMap);
-  }, [baseEnvironment?.variables, environment?.variables]);
-
-  return variables;
+  return useAtomValue(activeEnvironmentVariablesAtom);
 }
diff --git a/src-web/hooks/useEnvironments.ts b/src-web/hooks/useEnvironments.ts
index afcb7eb2..395288e6 100644
--- a/src-web/hooks/useEnvironments.ts
+++ b/src-web/hooks/useEnvironments.ts
@@ -4,11 +4,18 @@ import { atom } from 'jotai/index';
 
 export const environmentsAtom = atom<Environment[]>([]);
 
-export function useEnvironments() {
-  const allEnvironments = useAtomValue(environmentsAtom);
+export const environmentsBreakdownAtom = atom<{
+  baseEnvironment: Environment | null;
+  allEnvironments: Environment[];
+  subEnvironments: Environment[];
+}>((get) => {
+  const allEnvironments = get(environmentsAtom);
   const baseEnvironment = allEnvironments.find((e) => e.environmentId == null) ?? null;
   const subEnvironments =
     allEnvironments.filter((e) => e.environmentId === (baseEnvironment?.id ?? 'n/a')) ?? [];
-
   return { baseEnvironment, subEnvironments, allEnvironments } as const;
+});
+
+export function useEnvironments() {
+  return useAtomValue(environmentsBreakdownAtom);
 }