diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef5a3b65..84503118 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project somewhat adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).  The MAJOR version number is bumped when there are **"Breaking Changes"** in the pret projects. For more on this, see [the manual page on breaking changes](https://huderlem.github.io/porymap/manual/breaking-changes.html).
 
 ## [Unreleased]
+### Changed
+- The name field now receives focus immediately for the new map/layout dialogs.
+
 ### Fixed
 - Fix rare crash while quitting Porymap.
 
diff --git a/src/ui/newlayoutdialog.cpp b/src/ui/newlayoutdialog.cpp
index 98d16e62..de20bb29 100644
--- a/src/ui/newlayoutdialog.cpp
+++ b/src/ui/newlayoutdialog.cpp
@@ -47,6 +47,7 @@ NewLayoutDialog::NewLayoutDialog(Project *project, const Layout *layoutToCopy, Q
     } else {
         restoreGeometry(porymapConfig.newLayoutDialogGeometry);
     }
+    ui->lineEdit_Name->setFocus();
 }
 
 NewLayoutDialog::~NewLayoutDialog()
diff --git a/src/ui/newmapdialog.cpp b/src/ui/newmapdialog.cpp
index ccff84a6..c8a02802 100644
--- a/src/ui/newmapdialog.cpp
+++ b/src/ui/newmapdialog.cpp
@@ -62,6 +62,7 @@ NewMapDialog::NewMapDialog(Project *project, const Map *mapToCopy, QWidget *pare
 
     refresh();
     restoreGeometry(porymapConfig.newMapDialogGeometry);
+    ui->lineEdit_Name->setFocus();
 }
 
 // Adding new map to an existing map list folder. Initialize settings accordingly.