diff --git a/src/features/command/context.tsx b/src/features/command/context.tsx
index 6c39a3b..794c73c 100644
--- a/src/features/command/context.tsx
+++ b/src/features/command/context.tsx
@@ -75,6 +75,10 @@ const Root: ParentComponent<{ commands: CommandType[] }> = (props) => {
     });
 
     const listener = (e: KeyboardEvent) => {
+        if (!e.key) {
+            return;
+        }
+
         const key = e.key.toLowerCase();
         const modifiers =
             (e.shiftKey ? 1 : 0) << 0 |
diff --git a/src/features/file/grid.tsx b/src/features/file/grid.tsx
index 1deed61..d906a9c 100644
--- a/src/features/file/grid.tsx
+++ b/src/features/file/grid.tsx
@@ -47,7 +47,7 @@ export function Grid(props: { class?: string, rows: Entry[], locales: string[],
             renderer: ({ row, column, value, mutate }) => {
                 const entry = rows().value[row]!;
 
-                return <TextArea row={row} key={entry.key} lang={String(column)} value={value} oninput={e => mutate(e.data ?? '')} />;
+                return <TextArea row={row} key={entry.key} lang={String(column)} value={value ?? ''} oninput={e => mutate(e.data ?? '')} />;
             },
         }))
     ]);
@@ -58,9 +58,7 @@ export function Grid(props: { class?: string, rows: Entry[], locales: string[],
         const r = rows();
         const l = locales();
 
-        r.mutateEach(({ key, ...rest }) => {
-            return ({ key, ...Object.fromEntries(l.map(locale => [locale, rest[locale] ?? ''])) });
-        });
+        r.mutateEach(({ key, ...rest }) => ({ key, ...Object.fromEntries(l.map(locale => [locale, rest[locale] ?? ''])) }));
     });
 
     createEffect(() => {