diff --git a/src/components/dialogs/SaveImage.tsx b/src/components/dialogs/SaveImage.tsx
index 7bcf6a6..8031965 100644
--- a/src/components/dialogs/SaveImage.tsx
+++ b/src/components/dialogs/SaveImage.tsx
@@ -10,7 +10,7 @@ import { Input } from "@/components/ui/input";
 
 import { useTextures } from "@/hooks/useTextures";
 
-function SaveImage({ close }: DialogProps) {
+function SaveImage({ close, registerSubmit, dialogKeyHandler }: DialogProps) {
 	const { blocks, canvasSize, version } = useContext(CanvasContext);
 	const { missingTexture } = useContext(TexturesContext);
 
@@ -59,15 +59,17 @@ function SaveImage({ close }: DialogProps) {
 		close();
 	};
 
+	registerSubmit(onSubmit);
+
 	return (
-		<DialogContent>
+		<DialogContent onKeyDown={dialogKeyHandler}>
 			<DialogHeader>
 				<DialogTitle>Save as image (.png)</DialogTitle>
 				<DialogDescription>Save your canvas as a full size image</DialogDescription>
 			</DialogHeader>
 
 			<div className="flex items-center gap-2">
-				<Input value={fileName} onChange={(e) => setFileName(e.target.value)} />
+				<Input value={fileName} onChange={(e) => setFileName(e.target.value)} autoFocus />
 				<span>.png</span>
 			</div>
 
diff --git a/src/components/dialogs/SaveLitematic.tsx b/src/components/dialogs/SaveLitematic.tsx
index 8702f1b..4298ee5 100644
--- a/src/components/dialogs/SaveLitematic.tsx
+++ b/src/components/dialogs/SaveLitematic.tsx
@@ -19,7 +19,7 @@ type BlockStatePalette = {
 	Properties?: Record<string, string>;
 }[];
 
-function SaveLitematic({ close }: DialogProps) {
+function SaveLitematic({ close, registerSubmit, dialogKeyHandler }: DialogProps) {
 	const { canvasSize, blocks, version } = useContext(CanvasContext);
 	const { setLoading } = useContext(LoadingContext);
 
@@ -164,15 +164,17 @@ function SaveLitematic({ close }: DialogProps) {
 		close();
 	};
 
+	registerSubmit(onSubmit);
+
 	return (
-		<DialogContent>
+		<DialogContent onKeyDown={dialogKeyHandler}>
 			<DialogHeader>
 				<DialogTitle>Save as .litematic</DialogTitle>
 				<DialogDescription>Save your image as a litematic</DialogDescription>
 			</DialogHeader>
 
 			<div className="flex items-center gap-2">
-				<Input value={fileName} onChange={(e) => setFileName(e.target.value)} />
+				<Input value={fileName} onChange={(e) => setFileName(e.target.value)} autoFocus />
 				<span>.litematic</span>
 			</div>
 
diff --git a/src/components/dialogs/SaveSchem.tsx b/src/components/dialogs/SaveSchem.tsx
index f9e95ed..e4e928a 100644
--- a/src/components/dialogs/SaveSchem.tsx
+++ b/src/components/dialogs/SaveSchem.tsx
@@ -43,7 +43,7 @@ const blockEntitiesWhitelist = [
 	"vault",
 ];
 
-function SaveSchem({ close }: DialogProps) {
+function SaveSchem({ close, registerSubmit, dialogKeyHandler }: DialogProps) {
 	const { canvasSize, blocks, version } = useContext(CanvasContext);
 	const { setLoading } = useContext(LoadingContext);
 
@@ -166,15 +166,17 @@ function SaveSchem({ close }: DialogProps) {
 		close();
 	};
 
+	registerSubmit(onSubmit);
+
 	return (
-		<DialogContent>
+		<DialogContent onKeyDown={dialogKeyHandler}>
 			<DialogHeader>
 				<DialogTitle>Save as .schem</DialogTitle>
 				<DialogDescription>Save your image as a .schem (Sponge Version 3)</DialogDescription>
 			</DialogHeader>
 
 			<div className="flex items-center gap-2">
-				<Input value={fileName} onChange={(e) => setFileName(e.target.value)} />
+				<Input value={fileName} onChange={(e) => setFileName(e.target.value)} autoFocus />
 				<span>.schem</span>
 			</div>
 
diff --git a/src/components/dialogs/SetCoords.tsx b/src/components/dialogs/SetCoords.tsx
index ba9819d..f53701a 100644
--- a/src/components/dialogs/SetCoords.tsx
+++ b/src/components/dialogs/SetCoords.tsx
@@ -7,7 +7,7 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 
-function SetCoords({ close }: DialogProps) {
+function SetCoords({ close, registerSubmit, dialogKeyHandler }: DialogProps) {
 	const { stageSize, coords, scale, setCoords } = useContext(CanvasContext);
 
 	const [newTilemapCoords, setNewTilemapCoords] = useState(coords);
@@ -30,6 +30,8 @@ function SetCoords({ close }: DialogProps) {
 		close();
 	};
 
+	registerSubmit(onSubmit);
+
 	// Sets the current coordinates when the dialog is first opened
 	useEffect(() => {
 		// Get center of screen
@@ -47,7 +49,7 @@ function SetCoords({ close }: DialogProps) {
 	}, []);
 
 	return (
-		<DialogContent>
+		<DialogContent onKeyDown={dialogKeyHandler}>
 			<DialogHeader>
 				<DialogTitle>Set Coordinates</DialogTitle>
 				<DialogDescription>Set your coordinates to a particular position</DialogDescription>
@@ -62,6 +64,7 @@ function SetCoords({ close }: DialogProps) {
 						placeholder="X"
 						value={newTilemapCoords.x}
 						onChange={(e) => setNewTilemapCoords((prev) => ({ ...prev, x: parseInt(e.target.value) }))}
+						autoFocus
 					/>
 				</div>
 
diff --git a/src/components/dialogs/SetScale.tsx b/src/components/dialogs/SetScale.tsx
index 668b0f1..010f556 100644
--- a/src/components/dialogs/SetScale.tsx
+++ b/src/components/dialogs/SetScale.tsx
@@ -6,7 +6,7 @@ import { DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTit
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 
-function SetScale({ close }: DialogProps) {
+function SetScale({ close, registerSubmit, dialogKeyHandler }: DialogProps) {
 	const { scale, setScale } = useContext(CanvasContext);
 
 	const [newScale, setNewScale] = useState(scale * 100);
@@ -16,14 +16,16 @@ function SetScale({ close }: DialogProps) {
 		close();
 	};
 
+	registerSubmit(onSubmit);
+
 	return (
-		<DialogContent>
+		<DialogContent onKeyDown={dialogKeyHandler}>
 			<DialogHeader>
 				<DialogTitle>Set Scale</DialogTitle>
 				<DialogDescription>Set your scale to a particular percentage</DialogDescription>
 			</DialogHeader>
 
-			<Input type="number" value={newScale} onChange={(e) => setNewScale(parseInt(e.target.value))} />
+			<Input type="number" value={newScale} onChange={(e) => setNewScale(parseInt(e.target.value))} autoFocus />
 
 			<DialogFooter>
 				<Button variant="outline" onClick={close}>
diff --git a/src/components/dialogs/SetVersion.tsx b/src/components/dialogs/SetVersion.tsx
index 4881b80..cb42507 100644
--- a/src/components/dialogs/SetVersion.tsx
+++ b/src/components/dialogs/SetVersion.tsx
@@ -29,7 +29,7 @@ function SetVersion({ close }: DialogProps) {
 				<Button variant="outline" onClick={close}>
 					Cancel
 				</Button>
-				<Button type="submit" onClick={onSubmit}>
+				<Button type="submit" onClick={onSubmit} autoFocus>
 					Set
 				</Button>
 			</DialogFooter>
diff --git a/src/context/Dialog.tsx b/src/context/Dialog.tsx
index e6213f8..2d54cc7 100644
--- a/src/context/Dialog.tsx
+++ b/src/context/Dialog.tsx
@@ -1,5 +1,5 @@
 import { Dialog } from "@/components/ui/dialog";
-import { createContext, lazy, ReactNode, Suspense, useState } from "react";
+import { createContext, lazy, ReactNode, Suspense, useRef, useState } from "react";
 
 type Context = (id: string) => void;
 
@@ -13,19 +13,29 @@ export const DialogProvider = ({ children }: Props) => {
 	const [open, setOpen] = useState(false);
 	const [id, setId] = useState("");
 
+	const onSubmitRef = useRef<(() => void) | null>(null);
+
 	const openDialog = (id: string) => {
 		setId(id);
 		setOpen(true);
 	};
 
-	const LazyDialogContent = id ? lazy(() => import(`@/components/dialogs/${id}.tsx`)) : null;
+	const dialogKeyHandler = (e: React.KeyboardEvent) => {
+		if (!onSubmitRef.current) return;
+		if (e.key !== "Enter") return;
+
+		onSubmitRef.current();
+		close();
+	};
+
+	const LazyDialogContent = id ? lazy<React.ComponentType<DialogProps>>(() => import(`@/components/dialogs/${id}.tsx`)) : null;
 
 	return (
 		<DialogContext.Provider value={openDialog}>
 			<Dialog open={open} onOpenChange={(value) => setOpen(value)}>
 				{LazyDialogContent && (
 					<Suspense fallback={<div className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2">Loading dialog...</div>}>
-						<LazyDialogContent close={() => setOpen(false)} />
+						<LazyDialogContent close={() => setOpen(false)} registerSubmit={(fn) => (onSubmitRef.current = fn)} dialogKeyHandler={dialogKeyHandler} />
 					</Suspense>
 				)}
 			</Dialog>
diff --git a/src/types.d.ts b/src/types.d.ts
index fda4a6f..e11035f 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -36,6 +36,8 @@ interface Settings {
 
 interface DialogProps {
 	close: () => void;
+	registerSubmit: (fn: () => void) => void;
+	dialogKeyHandler: (e: React.KeyboardEvent) => void;
 }
 
 type BlockData = Record<