diff --git a/src-web/components/GraphQLDocsExplorer.tsx b/src-web/components/GraphQLDocsExplorer.tsx
index 92195fb5..4306e5f1 100644
--- a/src-web/components/GraphQLDocsExplorer.tsx
+++ b/src-web/components/GraphQLDocsExplorer.tsx
@@ -1,24 +1,36 @@
-/* eslint-disable */
-import { Color } from '@yaakapp-internal/plugins';
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import type { Color } from '@yaakapp-internal/plugins';
 import classNames from 'classnames';
-import type { GraphQLField, GraphQLInputField, GraphQLSchema, GraphQLType } from 'graphql';
+import { fuzzyMatch } from 'fuzzbunny';
+import type {
+  GraphQLField,
+  GraphQLInputField,
+  GraphQLNamedType,
+  GraphQLSchema,
+  GraphQLType,
+} from 'graphql';
 import {
   getNamedType,
   isEnumType,
   isInputObjectType,
   isInterfaceType,
   isListType,
+  isNamedType,
   isNonNullType,
   isObjectType,
   isScalarType,
   isUnionType,
 } from 'graphql';
-import { CSSProperties, memo, ReactNode, useState } from 'react';
+import type { CSSProperties, HTMLAttributes, KeyboardEvent, ReactNode } from 'react';
+import { Fragment, memo, useCallback, useMemo, useRef, useState } from 'react';
 import { showGraphQLDocExplorerAtom } from '../atoms/graphqlSchemaAtom';
+import { useDebouncedValue } from '../hooks/useDebouncedValue';
+import { useRandomKey } from '../hooks/useRandomKey';
 import { jotaiStore } from '../lib/jotai';
 import { CountBadge } from './core/CountBadge';
 import { Icon } from './core/Icon';
 import { IconButton } from './core/IconButton';
+import { PlainInput } from './core/PlainInput';
 import { Markdown } from './Markdown';
 
 interface Props {
@@ -33,7 +45,11 @@ type ExplorerItem =
   | { kind: 'input_field'; type: GraphQLInputField; from: ExplorerItem }
   | null;
 
-export const GraphQLDocsExplorer = memo(function ({ style, schema, className }: Props) {
+export const GraphQLDocsExplorer = memo(function GraphQLDocsExplorer({
+  style,
+  schema,
+  className,
+}: Props) {
   const [activeItem, setActiveItem] = useState<ExplorerItem>(null);
 
   const qryType = schema.getQueryType();
@@ -48,7 +64,7 @@ export const GraphQLDocsExplorer = memo(function ({ style, schema, className }:
   return (
     <div className={classNames(className, 'py-3 mx-3')} style={style}>
       <div className="h-full border border-dashed border-border rounded-lg">
-        <GraphQLExplorerHeader item={activeItem} setItem={setActiveItem} />
+        <GraphQLExplorerHeader item={activeItem} setItem={setActiveItem} schema={schema} />
         {activeItem == null ? (
           <div className="flex flex-col gap-3 overflow-y-auto h-full w-full p-3">
             <Heading>Root Types</Heading>
@@ -87,7 +103,10 @@ export const GraphQLDocsExplorer = memo(function ({ style, schema, className }:
             </div>
           </div>
         ) : (
-          <div className="overflow-y-auto h-full w-full px-3 grid grid-cols-[minmax(0,1fr)]">
+          <div
+            key={activeItem.type.toString()} // Reset scroll position to top
+            className="overflow-y-auto h-full w-full px-3 grid grid-cols-[minmax(0,1fr)]"
+          >
             <GqlTypeInfo item={activeItem} setItem={setActiveItem} schema={schema} />
           </div>
         )}
@@ -99,36 +118,50 @@ export const GraphQLDocsExplorer = memo(function ({ style, schema, className }:
 function GraphQLExplorerHeader({
   item,
   setItem,
+  schema,
 }: {
   item: ExplorerItem;
   setItem: (t: ExplorerItem) => void;
+  schema: GraphQLSchema;
 }) {
+  const findIt = (t: ExplorerItem): ExplorerItem[] => {
+    if (t == null) return [null];
+    return [...findIt(t.from), t];
+  };
+  const crumbs = findIt(item);
   return (
-    <nav className="pl-2 pr-1 h-md grid grid-rows-1 grid-cols-[minmax(0,1fr)_auto] items-center gap-2 overflow-x-auto min-w-0 hide-scrollbars">
-      <div className="w-full">
-        {item == null ? (
-          <div className="flex items-center gap-2">
-            <Icon icon="house" color="secondary" />
-            <div className="text-text-subtle whitespace-nowrap _truncate">Schema Documentation</div>
-          </div>
-        ) : (
-          <GqlTypeLink
-            item={item.from}
-            setItem={setItem}
-            className="text-text-subtle !font-sans !text-base"
-            leftSlot={<Icon icon="chevron_left" color="secondary" />}
-          />
-        )}
+    <nav className="relative pl-2 pr-1 h-lg grid grid-rows-1 grid-cols-[auto_minmax(0,1fr)_auto] items-center min-w-0 gap-1">
+      <div className="mr-3 whitespace-nowrap flex items-center gap-2 hide-scrollbars text-text-subtle overflow-x-auto hide-scrollbars text-sm">
+        <Icon icon="book_open_text" />
+        {crumbs.map((crumb, i) => {
+          return (
+            <Fragment key={i}>
+              {i > 0 && <Icon icon="chevron_right" className="text-text-subtlest" />}
+              {crumb === item || item == null ? (
+                <GqlTypeLabel item={item} />
+              ) : crumb === item ? null : (
+                <GqlTypeLink
+                  key={i}
+                  item={crumb}
+                  setItem={setItem}
+                  className="!font-sans !text-sm"
+                />
+              )}
+            </Fragment>
+          );
+        })}
+      </div>
+      <GqlSchemaSearch currentItem={item} schema={schema} setItem={(item) => setItem(item)} />
+      <div className="ml-auto flex gap-1 [&>*]:text-text-subtle">
+        <IconButton
+          icon="x"
+          size="sm"
+          title="Close documenation explorer"
+          onClick={() => {
+            jotaiStore.set(showGraphQLDocExplorerAtom, false);
+          }}
+        />
       </div>
-      <IconButton
-        icon="x"
-        size="sm"
-        className="text-text-subtle"
-        title="Close documenation explorer"
-        onClick={() => {
-          jotaiStore.set(showGraphQLDocExplorerAtom, false);
-        }}
-      />
     </nav>
   );
 }
@@ -144,13 +177,14 @@ function GqlTypeInfo({
 }) {
   if (item == null) return null;
 
-  const name = item.kind === 'type' ? getNamedType(item.type).name : item.type.name;
   const description =
     item.kind === 'type' ? getNamedType(item.type).description : item.type.description;
 
   const heading = (
     <div className="mb-3">
-      <Heading>{name}</Heading>
+      <Heading>
+        <GqlTypeLabel item={item} />
+      </Heading>
       <DocMarkdown>{description || 'No description'}</DocMarkdown>
     </div>
   );
@@ -161,7 +195,7 @@ function GqlTypeInfo({
     // kinda a hack, but we'll just unwrap there and show the named type
     return (
       <GqlTypeInfo
-        item={{ ...item, kind: 'type', type: item.type.ofType }}
+        item={toExplorerItem(item.type.ofType, item)}
         setItem={setItem}
         schema={schema}
       />
@@ -177,7 +211,7 @@ function GqlTypeInfo({
         <Subheading count={Object.keys(fields).length}>Fields</Subheading>
         {Object.keys(fields).map((fieldName) => {
           const field = fields[fieldName]!;
-          const fieldItem: ExplorerItem = { kind: 'field', type: field, from: item };
+          const fieldItem: ExplorerItem = toExplorerItem(field, item);
           return (
             <div key={`${field.type}::${field.name}`} className="my-4">
               <GqlTypeRow
@@ -193,11 +227,7 @@ function GqlTypeInfo({
           <>
             <Subheading>Implemented By</Subheading>
             {possibleTypes.map((t: any) => (
-              <GqlTypeRow
-                key={t.name}
-                item={{ kind: 'type', type: t, from: item }}
-                setItem={setItem}
-              />
+              <GqlTypeRow key={t.name} item={toExplorerItem(t, item)} setItem={setItem} />
             ))}
           </>
         )}
@@ -248,20 +278,22 @@ function GqlTypeInfo({
         {item.type.args.length > 0 && (
           <div>
             <Subheading>Arguments</Subheading>
-            {item.type.args.map((a) => (
-              <div key={a.type + '::' + a.name} className="my-4">
-                <GqlTypeRow
-                  name={{ value: a.name, color: 'info' }}
-                  item={{ kind: 'input_field', type: a, from: item }}
-                  setItem={setItem}
-                />
-              </div>
-            ))}
+            {item.type.args.map((a) => {
+              return (
+                <div key={a.type + '::' + a.name} className="my-4">
+                  <GqlTypeRow
+                    name={{ value: a.name, color: 'info' }}
+                    item={{ kind: 'type', type: a.type, from: item }}
+                    setItem={setItem}
+                  />
+                </div>
+              );
+            })}
           </div>
         )}
       </div>
     );
-  } else if (item.kind === 'input_field' && isInputObjectType(item.type)) {
+  } else if (isInputObjectType(item.type)) {
     const fields = item.type.getFields();
     return (
       <div>
@@ -288,34 +320,7 @@ function GqlTypeInfo({
         })}
       </div>
     );
-  } else if (item.kind === 'type' && isInputObjectType(item.type)) {
-    const fields = item.type.getFields();
-    return (
-      <div>
-        {heading}
-
-        <Subheading count={Object.keys(fields).length}>Fields</Subheading>
-        {Object.keys(fields).map((fieldName) => {
-          const field = fields[fieldName];
-          if (field == null) return null;
-          const fieldItem: ExplorerItem = {
-            kind: 'input_field',
-            type: field,
-            from: item,
-          };
-          return (
-            <div key={`${field.type}::${field.name}`} className="my-4">
-              <GqlTypeRow
-                item={fieldItem}
-                setItem={setItem}
-                name={{ value: fieldName, color: 'primary' }}
-              />
-            </div>
-          );
-        })}
-      </div>
-    );
-  } else if (item.kind === 'type' && isObjectType(item.type)) {
+  } else if (isObjectType(item.type)) {
     const fields = item.type.getFields();
     const interfaces = item.type.getInterfaces();
 
@@ -354,7 +359,7 @@ function GqlTypeInfo({
     );
   }
 
-  console.log('Unknown GraphQL Type', item);
+  console.log('Unknown GraphQL Type', item.type, isNonNullType(item.type));
   return <div>Unknown GraphQL type</div>;
 }
 
@@ -466,13 +471,17 @@ function GqlTypeLink({
   color,
   children,
   leftSlot,
+  rightSlot,
+  onNavigate,
   className,
 }: {
   item: ExplorerItem;
   color?: Color;
   setItem: (item: ExplorerItem) => void;
+  onNavigate?: () => void;
   children?: ReactNode;
   leftSlot?: ReactNode;
+  rightSlot?: ReactNode;
   className?: string;
 }) {
   if (item?.kind === 'type' && isListType(item.type)) {
@@ -484,8 +493,10 @@ function GqlTypeLink({
           setItem={setItem}
           color={color}
           leftSlot={leftSlot}
-          children={children}
-        />
+          rightSlot={rightSlot}
+        >
+          {children}
+        </GqlTypeLink>
         <span className="text-text-subtle">]</span>
       </span>
     );
@@ -497,8 +508,10 @@ function GqlTypeLink({
           setItem={setItem}
           color={color}
           leftSlot={leftSlot}
-          children={children}
-        />
+          rightSlot={rightSlot}
+        >
+          {children}
+        </GqlTypeLink>
         <span className="text-text-subtle">!</span>
       </span>
     );
@@ -518,40 +531,257 @@ function GqlTypeLink({
         color === 'notice' && 'text-notice',
         color === 'info' && 'text-info',
       )}
-      onClick={() => setItem(item)}
+      onClick={() => {
+        setItem(item);
+        onNavigate?.();
+      }}
     >
       {leftSlot}
-      <GqlTypeLabel item={item} children={children} />
+      <GqlTypeLabel item={item}>{children}</GqlTypeLabel>
+      {rightSlot}
     </button>
   );
 }
 
-function GqlTypeLabel({ item, children }: { item: ExplorerItem; children?: ReactNode }) {
+function GqlTypeLabel({
+  item,
+  children,
+  className,
+}: {
+  item: ExplorerItem;
+  children?: ReactNode;
+  className?: string;
+}) {
   let inner;
   if (children) {
     inner = children;
   } else if (item == null) {
     inner = 'Root';
-  } else if (item.kind === 'type') {
-    inner = getNamedType(item.type).name;
+  } else if (item.kind === 'field') {
+    inner = item.type.name + (item.type.args.length > 0 ? '(…)' : '');
+  } else if ('name' in item.type) {
+    inner = item.type.name;
   } else {
-    inner = getNamedType(item.type.type).name;
+    console.error('Unknown item type', item);
+    inner = 'UNKNOWN';
   }
 
-  return <div className="_truncate">{inner}</div>;
+  return <span className={classNames(className, 'truncate')}>{inner}</span>;
 }
 
 function Subheading({ children, count }: { children: ReactNode; count?: number }) {
   return (
     <h2 className="font-bold text-lg mt-6 flex items-center">
-      <div className="_truncate min-w-0">{children}</div>
+      <div className="truncate min-w-0">{children}</div>
       {count && <CountBadge count={count} />}
     </h2>
   );
 }
 
+interface SearchResult {
+  name: string;
+  type: GraphQLNamedType | GraphQLField<any, any> | GraphQLInputField;
+  score: number;
+  from: GraphQLNamedType | null;
+  depth: string[];
+}
+
+function GqlSchemaSearch({
+  schema,
+  currentItem,
+  setItem,
+  className,
+}: {
+  currentItem: ExplorerItem | null;
+  schema: GraphQLSchema;
+  setItem: (t: ExplorerItem) => void;
+  className?: string;
+}) {
+  const [activeResult, setActiveResult] = useState<SearchResult | null>(null);
+  const [forceRefreshKey, regenerateForceRefreshKey] = useRandomKey();
+  const [focused, setFocused] = useState<boolean>(false);
+  const [value, setValue] = useState<string>('');
+  const debouncedValue = useDebouncedValue(value, 300);
+  const canSearch =
+    currentItem == null ||
+    (isNamedType(currentItem.type) &&
+      !isEnumType(currentItem.type) &&
+      !isScalarType(currentItem.type));
+
+  const results = useMemo(() => {
+    const results: SearchResult[] = [];
+    walkTypeGraph(
+      currentItem?.type ?? null,
+      (type, from, depth) => {
+        if (type === currentItem?.type) {
+          return null; // Remove the current type from results
+        }
+
+        const match = fuzzyMatch(type.name, debouncedValue);
+        if (match == null) {
+          // Do nothing
+        } else {
+          results.push({ name: type.name, type, score: match.score, from, depth });
+        }
+      },
+      schema,
+    );
+    results.sort((a, b) => {
+      if (value == '') {
+        if (a.name.startsWith('_') && !b.name.startsWith('_')) {
+          // Always sort __<NAME> types to the end when there is no query
+          return 1;
+        } else if (a.depth.length !== b.depth.length) {
+          return a.depth.length - b.depth.length;
+        } else {
+          return a.name.localeCompare(b.name);
+        }
+      } else {
+        if (a.depth.length !== b.depth.length) {
+          return a.depth.length - b.depth.length;
+        } else if (a.score === 0 && b.score === 0) {
+          return a.name.localeCompare(b.name);
+        } else if (a.score === b.score && a.name.length === b.name.length) {
+          return a.name.localeCompare(b.name);
+        } else if (a.score === b.score) {
+          return a.name.length - b.type.name.length;
+        } else {
+          return b.score - a.score;
+        }
+      }
+    });
+    return results.slice(0, 40);
+  }, [currentItem, schema, debouncedValue, value]);
+
+  const activeIndex = useMemo(() => {
+    const index = results.findIndex((r) => r === activeResult) ?? 0;
+    return index === -1 ? 0 : index;
+  }, [activeResult, results]);
+
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  const handleKeyDown = useCallback(
+    (e: KeyboardEvent<HTMLInputElement>) => {
+      if (e.key === 'ArrowDown' || (e.ctrlKey && e.key === 'n')) {
+        e.preventDefault();
+        const next = results[activeIndex + 1] ?? results[results.length - 1] ?? null;
+        setActiveResult(next);
+      } else if (e.key === 'ArrowUp' || (e.ctrlKey && e.key === 'k')) {
+        e.preventDefault();
+        const prev = results[activeIndex - 1] ?? results[0] ?? null;
+        setActiveResult(prev);
+      } else if (e.key === 'Escape') {
+        inputRef.current?.blur();
+      } else if (e.key === 'Enter') {
+        const result = activeResult ?? results[0] ?? null;
+        if (result) {
+          setItem(toExplorerItem(result?.type, currentItem));
+          inputRef.current?.blur();
+        }
+      }
+    },
+    [results, activeIndex, activeResult, setItem, currentItem],
+  );
+
+  if (!canSearch) return null;
+
+  return (
+    <div
+      className={classNames(
+        className,
+        'relative flex items-center bg-surface z-20',
+        !focused && 'w-[6rem] ml-auto',
+        focused && '!absolute top-0 left-1.5 right-1.5 bottom-0',
+      )}
+    >
+      <PlainInput
+        ref={inputRef}
+        size="sm"
+        label="search"
+        hideLabel
+        defaultValue={value}
+        placeholder={focused ? 'Search ' + (currentItem?.type.toString() ?? 'Schema') : 'Search'}
+        forceUpdateKey={forceRefreshKey}
+        leftSlot={
+          <div className="w-10 flex justify-center items-center">
+            <Icon size="sm" icon="search" color="secondary" />
+          </div>
+        }
+        onChange={setValue}
+        onKeyDownCapture={handleKeyDown}
+        onBlur={() => {
+          setTimeout(() => {
+            setFocused(false);
+            setValue('');
+            regenerateForceRefreshKey();
+          }, 100);
+        }}
+        onFocus={() => {
+          setFocused(true);
+        }}
+      />
+      <div
+        className={classNames(
+          'x-theme-menu absolute z-10 mt-0.5 p-1.5 top-full right-0 bg-surface',
+          'border border-border rounded-lg overflow-y-auto min-w-[20rem] max-h-[20rem] w-full shadow-lg',
+          !focused && 'hidden',
+        )}
+      >
+        {results.length === 0 && (
+          <SearchResult isActive={false} className="text-text-subtle">
+            No results found
+          </SearchResult>
+        )}
+        {results.map((r, i) => {
+          const item = toExplorerItem(r.type, currentItem);
+          if (item == currentItem) return null;
+          return (
+            <SearchResult
+              key={`${i}::${r.type.name}`}
+              onClick={() => setItem(item)}
+              onMouseEnter={() => setActiveResult(r)}
+              isActive={i === activeIndex}
+            >
+              {r.from !== currentItem?.type && r.from != null && (
+                <>
+                  <GqlTypeLabel
+                    item={toExplorerItem(r.from, currentItem)}
+                    className="text-text-subtle"
+                  />
+                  .
+                </>
+              )}
+              <GqlTypeLabel item={item} className="text-notice" />
+            </SearchResult>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
+
+function SearchResult({
+  isActive,
+  className,
+  ...extraProps
+}: {
+  isActive: boolean;
+  children: ReactNode;
+} & HTMLAttributes<HTMLButtonElement>) {
+  return (
+    <button
+      className={classNames(
+        className,
+        'px-3 truncate w-full text-left h-sm rounded',
+        isActive && 'bg-surface-highlight',
+      )}
+      {...extraProps}
+    />
+  );
+}
+
 function Heading({ children }: { children: ReactNode }) {
-  return <h1 className="font-bold text-2xl _truncate">{children}</h1>;
+  return <h1 className="font-bold text-2xl truncate">{children}</h1>;
 }
 
 function DocMarkdown({ children, className }: { children: string | null; className?: string }) {
@@ -559,3 +789,101 @@ function DocMarkdown({ children, className }: { children: string | null; classNa
     <Markdown className={classNames(className, '!text-text-subtle italic')}>{children}</Markdown>
   );
 }
+
+function walkTypeGraph(
+  start: GraphQLType | GraphQLField<any, any> | GraphQLInputField | null,
+  cb: (
+    type: GraphQLNamedType | GraphQLField<any, any> | GraphQLInputField,
+    from: GraphQLNamedType | null,
+    path: string[],
+  ) => void,
+  schema: GraphQLSchema,
+) {
+  const visited = new Set<string>();
+  const queue: Array<{
+    current: GraphQLType | GraphQLField<any, any> | GraphQLInputField;
+    from: GraphQLNamedType | null;
+    path: string[];
+  }> = [];
+
+  const initial = start
+    ? [start]
+    : [
+        ...Object.values(schema.getTypeMap()),
+        schema.getQueryType(),
+        schema.getMutationType(),
+        schema.getSubscriptionType(),
+      ].filter((t) => t != null);
+
+  for (const type of initial) {
+    queue.push({ current: type, from: null, path: [] });
+  }
+
+  while (queue.length > 0) {
+    const { current, from, path } = queue.shift()!;
+    if (!isNamedType(current)) continue;
+
+    const name = current.name;
+    if (visited.has(name)) continue;
+    visited.add(name);
+
+    cb(current, from, path);
+
+    if (isObjectType(current) || isInterfaceType(current)) {
+      for (const field of Object.values(current.getFields())) {
+        cb(field, current, [...path, current.name]);
+
+        const fieldType = getNamedType(field.type);
+        const next = schema.getType(fieldType.name);
+        if (next && !visited.has(fieldType.name)) {
+          queue.push({
+            current: next,
+            from: current,
+            path: [...path, current.name, field.name],
+          });
+        }
+      }
+    } else if (isInputObjectType(current)) {
+      for (const inputField of Object.values(current.getFields())) {
+        cb(inputField, current, [...path, current.name]);
+
+        const fieldType = getNamedType(inputField.type);
+        const next = schema.getType(fieldType.name);
+        if (next && !visited.has(fieldType.name)) {
+          queue.push({
+            current: next,
+            from: current,
+            path: [...path, current.name, inputField.name],
+          });
+        }
+      }
+    } else if (isUnionType(current)) {
+      for (const subtype of current.getTypes()) {
+        if (!visited.has(subtype.name)) {
+          queue.push({
+            current: subtype,
+            from: current,
+            path: [...path, current.name, subtype.name],
+          });
+        }
+      }
+    }
+  }
+}
+
+function toExplorerItem(t: any, from: ExplorerItem | null): ExplorerItem {
+  if (t == null) return null;
+
+  // GraphQLField-like: has `args` and `type`
+  if (t && typeof t === 'object' && Array.isArray(t.args) && t.type) {
+    return { kind: 'field', type: t, from };
+  }
+
+  // GraphQLInputField-like: has `type` and maybe `defaultValue`, but no `args`
+  if (t && typeof t === 'object' && t.type && !('args' in t)) {
+    return { kind: 'input_field', type: t, from };
+  }
+
+  // Otherwise, assume GraphQLType (object, scalar, enum, etc.)
+  return { kind: 'type', type: t, from };
+}
diff --git a/src-web/components/WorkspaceHeader.tsx b/src-web/components/WorkspaceHeader.tsx
index 6d8fa3a5..546a387a 100644
--- a/src-web/components/WorkspaceHeader.tsx
+++ b/src-web/components/WorkspaceHeader.tsx
@@ -57,7 +57,7 @@ export const WorkspaceHeader = memo(function WorkspaceHeader({ className }: Prop
           <LicenseBadge />
         )}
         <IconButton
-          icon="search"
+          icon="square_terminal"
           title="Search or execute a command"
           size="sm"
           iconColor="secondary"
diff --git a/src-web/components/core/Icon.tsx b/src-web/components/core/Icon.tsx
index 22c338d3..2410a1bd 100644
--- a/src-web/components/core/Icon.tsx
+++ b/src-web/components/core/Icon.tsx
@@ -42,6 +42,7 @@ const icons = {
   copy: lucide.CopyIcon,
   copy_check: lucide.CopyCheck,
   download: lucide.DownloadIcon,
+  ellipsis: lucide.EllipsisIcon,
   external_link: lucide.ExternalLinkIcon,
   eye: lucide.EyeIcon,
   eye_closed: lucide.EyeOffIcon,
@@ -97,6 +98,7 @@ const icons = {
   shield: lucide.ShieldIcon,
   shield_check: lucide.ShieldCheckIcon,
   shield_off: lucide.ShieldOffIcon,
+  square_terminal: lucide.SquareTerminalIcon,
   sparkles: lucide.SparklesIcon,
   sun: lucide.SunIcon,
   table: lucide.TableIcon,
diff --git a/src-web/components/core/PlainInput.tsx b/src-web/components/core/PlainInput.tsx
index 38fae6f3..90a4ff6a 100644
--- a/src-web/components/core/PlainInput.tsx
+++ b/src-web/components/core/PlainInput.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import type { FocusEvent, HTMLAttributes } from 'react';
-import { useCallback, useRef, useState } from 'react';
+import { forwardRef, useCallback, useImperativeHandle, useRef, useState } from 'react';
 import { useStateWithDeps } from '../../hooks/useStateWithDeps';
 import { IconButton } from './IconButton';
 import type { InputProps } from './Input';
@@ -15,39 +15,46 @@ export type PlainInputProps = Omit<InputProps, 'wrapLines' | 'onKeyDown' | 'type
     hideObscureToggle?: boolean;
   };
 
-export function PlainInput({
-  autoFocus,
-  autoSelect,
-  className,
-  containerClassName,
-  defaultValue,
-  forceUpdateKey,
-  help,
-  hideLabel,
-  hideObscureToggle,
-  label,
-  labelClassName,
-  labelPosition = 'top',
-  leftSlot,
-  name,
-  onBlur,
-  onChange,
-  onFocus,
-  onFocusRaw,
-  onKeyDownCapture,
-  onPaste,
-  placeholder,
-  required,
-  rightSlot,
-  size = 'md',
-  tint,
-  type = 'text',
-  validate,
-}: PlainInputProps) {
+export const PlainInput = forwardRef<{ focus: () => void }, PlainInputProps>(function PlainInput(
+  {
+    autoFocus,
+    autoSelect,
+    className,
+    containerClassName,
+    defaultValue,
+    forceUpdateKey,
+    help,
+    hideLabel,
+    hideObscureToggle,
+    label,
+    labelClassName,
+    labelPosition = 'top',
+    leftSlot,
+    name,
+    onBlur,
+    onChange,
+    onFocus,
+    onFocusRaw,
+    onKeyDownCapture,
+    onPaste,
+    placeholder,
+    required,
+    rightSlot,
+    size = 'md',
+    tint,
+    type = 'text',
+    validate,
+  },
+  ref,
+) {
   const [obscured, setObscured] = useStateWithDeps(type === 'password', [type]);
   const [focused, setFocused] = useState(false);
-  const [hasChanged, setHasChanged] = useState<boolean>(false);
+  const [hasChanged, setHasChanged] = useStateWithDeps<boolean>(false, [forceUpdateKey]);
   const inputRef = useRef<HTMLInputElement>(null);
+  useImperativeHandle<{ focus: () => void } | null, { focus: () => void } | null>(
+    ref,
+    () => inputRef.current,
+  );
   const textareaRef = useRef<HTMLTextAreaElement>(null);
 
   const handleFocus = useCallback(
@@ -87,7 +94,7 @@ export function PlainInput({
       };
       inputRef.current?.setCustomValidity(isValid(value) ? '' : 'Invalid value');
     },
-    [onChange, required, validate],
+    [onChange, required, setHasChanged, validate],
   );
 
   const wrapperRef = useRef<HTMLDivElement>(null);
@@ -102,7 +109,13 @@ export function PlainInput({
         labelPosition === 'top' && 'flex-row gap-0.5',
       )}
     >
-      <Label htmlFor={id} className={labelClassName} visuallyHidden={hideLabel} required={required} help={help}>
+      <Label
+        htmlFor={id}
+        className={labelClassName}
+        visuallyHidden={hideLabel}
+        required={required}
+        help={help}
+      >
         {label}
       </Label>
       <HStack
@@ -149,7 +162,7 @@ export function PlainInput({
             autoCorrect="off"
             onChange={(e) => handleChange(e.target.value)}
             onPaste={(e) => onPaste?.(e.clipboardData.getData('Text'))}
-            className={classNames(commonClassName, 'h-auto')}
+            className={classNames(commonClassName, 'h-full')}
             onFocus={handleFocus}
             onBlur={handleBlur}
             required={required}
@@ -173,7 +186,7 @@ export function PlainInput({
       </HStack>
     </div>
   );
-}
+});
 
 function validateRequire(v: string) {
   return v.length > 0;
diff --git a/src-web/hooks/useToggle.ts b/src-web/hooks/useToggle.ts
index 33f5c589..af9d66c3 100644
--- a/src-web/hooks/useToggle.ts
+++ b/src-web/hooks/useToggle.ts
@@ -3,5 +3,5 @@ import { useCallback, useState } from 'react';
 export function useToggle(initialValue = false) {
   const [value, setValue] = useState<boolean>(initialValue);
   const toggle = useCallback(() => setValue((v) => !v), []);
-  return [value, toggle] as const;
+  return [value, toggle, setValue] as const;
 }
diff --git a/src-web/tailwind.config.cjs b/src-web/tailwind.config.cjs
index 173a5818..4d73b496 100644
--- a/src-web/tailwind.config.cjs
+++ b/src-web/tailwind.config.cjs
@@ -5,6 +5,7 @@ const sizes = {
   xs: '1.8rem',
   sm: '2.0rem',
   md: '2.3rem',
+  lg: '2.6rem',
 };
 
 /** @type {import('tailwindcss').Config} */