diff --git a/packages/website-ue/src/components/AvatarControls/index.tsx b/packages/website-ue/src/components/AvatarControls/index.tsx
index 812a87946..9e647196e 100644
--- a/packages/website-ue/src/components/AvatarControls/index.tsx
+++ b/packages/website-ue/src/components/AvatarControls/index.tsx
@@ -1,5 +1,5 @@
 import { MagnifyingGlassIcon } from "@radix-ui/react-icons";
-import { useRef } from "react";
+import { useCallback, useEffect, useRef } from "react";
 import { useStrings } from "../../hooks/useStrings";
 import { Avatars } from "../../stores/avatars";
 import { TextField } from "../TextField";
@@ -9,23 +9,29 @@ export function AvatarControls() {
   const strings = useStrings();
   const search = useRef<HTMLInputElement>(null);
 
+  const onChange = useCallback(() => {
+    if (!search.current) return;
+
+    const trimmed = search.current.value.trim();
+
+    Avatars.mutate((draft) => {
+      if (trimmed.length === 0) {
+        draft.search = null;
+      } else {
+        draft.search = trimmed;
+      }
+    });
+  }, []);
+
+  useEffect(onChange, []);
+
   return (
     <div className="avatar-controls">
       <TextField
         ref={search}
         className="search"
         placeholder={strings.avatars.search}
-        onChange={(event) => {
-          const trimmed = event.target.value.trim();
-
-          Avatars.mutate((draft) => {
-            if (trimmed.length === 0) {
-              draft.search = null;
-            } else {
-              draft.search = trimmed;
-            }
-          });
-        }}
+        onLoad={onChange}
       >
         <MagnifyingGlassIcon />
       </TextField>
diff --git a/packages/website-ue/src/components/TextField/index.css b/packages/website-ue/src/components/TextField/index.css
index 65a7890aa..7bf21f39f 100644
--- a/packages/website-ue/src/components/TextField/index.css
+++ b/packages/website-ue/src/components/TextField/index.css
@@ -9,6 +9,7 @@
 
   background-color: var(--gray-1);
   box-shadow: var(--shadow-interactive), var(--shadow-cavity);
+  cursor: text;
 
   font-size: var(--font-size-regular);
   color: var(--gray-11);
@@ -26,6 +27,17 @@
     box-shadow: var(--shadow-focus);
   }
 
+  &[data-disabled="true"] {
+    cursor: not-allowed;
+    background-color: var(--gray-3);
+
+    color: var(--gray-9);
+
+    input::placeholder {
+      color: var(--gray-9);
+    }
+  }
+
   svg {
     width: 1em;
     height: 1em;
@@ -37,6 +49,7 @@
 
     background: none;
     border: none;
+    cursor: inherit;
 
     font-size: inherit;
     font-weight: medium;
diff --git a/packages/website-ue/src/components/TextField/index.tsx b/packages/website-ue/src/components/TextField/index.tsx
index af5fc7949..528bb473d 100644
--- a/packages/website-ue/src/components/TextField/index.tsx
+++ b/packages/website-ue/src/components/TextField/index.tsx
@@ -13,7 +13,7 @@ export interface TextFieldProps extends ComponentProps<"input"> {
 }
 
 export const TextField = forwardRef<HTMLInputElement, TextFieldProps>(
-  ({ children, className, ...props }, ref) => {
+  ({ children, className, disabled, ...props }, ref) => {
     const input = useRef<HTMLInputElement>(null);
 
     useImperativeHandle(ref, () => input.current!, []);
@@ -22,9 +22,10 @@ export const TextField = forwardRef<HTMLInputElement, TextFieldProps>(
       <div
         className={classNames("text-field", className)}
         data-has-icon={children !== undefined}
+        data-disabled={disabled}
       >
         {children}
-        <input ref={input} {...props} />
+        <input disabled={disabled} ref={input} {...props} />
       </div>
     );
   }
diff --git a/packages/website-ue/src/pages/[...locale]/avatars/_index.tsx b/packages/website-ue/src/pages/[...locale]/avatars/_index.tsx
index bcf2a28ac..729529ecf 100644
--- a/packages/website-ue/src/pages/[...locale]/avatars/_index.tsx
+++ b/packages/website-ue/src/pages/[...locale]/avatars/_index.tsx
@@ -3,7 +3,7 @@ import { AvatarsList } from "../../../components/AvatarsList";
 import { Section } from "../../../components/Section";
 import { LocaleProvider } from "../../../hooks/useLocale";
 
-interface PageProps extends ContentProps {
+interface PageProps {
   locale: string;
 }
 
@@ -15,11 +15,7 @@ export function Page({ locale, ...props }: PageProps) {
   );
 }
 
-interface ContentProps {
-  skeleton?: boolean;
-}
-
-function Content({}: ContentProps) {
+function Content() {
   return (
     <>
       <Section>
diff --git a/packages/website-ue/src/pages/[...locale]/avatars/index.astro b/packages/website-ue/src/pages/[...locale]/avatars/index.astro
index 54cf5399d..34468ebac 100644
--- a/packages/website-ue/src/pages/[...locale]/avatars/index.astro
+++ b/packages/website-ue/src/pages/[...locale]/avatars/index.astro
@@ -11,8 +11,5 @@ const { locale } = Astro.props;
 
 <BaseLayout {locale} accent="gold">
   <ToolBanner {locale} tool={tools.avatars} slot="pre-app" />
-
-  <Page {locale} client:only="react">
-    <Page {locale} skeleton slot="fallback" />
-  </Page>
+  <Page {locale} client:load />
 </BaseLayout>