diff --git a/client/drawer.module.css b/client/drawer.module.css
index cf99438..56d045d 100644
--- a/client/drawer.module.css
+++ b/client/drawer.module.css
@@ -64,3 +64,7 @@ button.fab {
 :global(.dark) .githubMark {
   filter: invert(100%);
 }
+
+.filenameText {
+  margin-right: 20px;
+}
\ No newline at end of file
diff --git a/client/drawer.tsx b/client/drawer.tsx
index f02204d..48235c7 100644
--- a/client/drawer.tsx
+++ b/client/drawer.tsx
@@ -124,7 +124,7 @@ export function Drawer() {
                         />
                       )}
                     </ListItemIcon>
-                    <ListItemText>
+                    <ListItemText className={styles.filenameText}>
                       {drawingId.localId
                         ? drawingId.localId
                         : drawingId.shareSpec
@@ -556,6 +556,7 @@ function NewDrawingButton() {
       <DialogContent>
         <TextField
           error={!validDrawingName}
+          autoFocus={true}
           label="Drawing name"
           helperText={!validDrawingName && "Drawing name must be unique."}
           defaultValue={defaultNewDrawingName}
@@ -600,6 +601,7 @@ function RenameDrawingButton({ drawingId }: { drawingId: DrawingId }) {
       <DialogContent>Provide a new name for the drawing.</DialogContent>
       <DialogContent>
         <TextField
+          autoFocus={true}
           error={!validDrawingName}
           label="Drawing name"
           helperText={!validDrawingName && "Drawing name already exists."}
@@ -661,6 +663,7 @@ function ForkDrawingButton({
       <DialogContent>
         <TextField
           error={!validDrawingName}
+          autoFocus={true}
           label="Drawing name"
           helperText={!validDrawingName && "Drawing name already exists."}
           defaultValue={defaultNewDrawingName}