diff --git a/src/main/java/me/coley/j2h/Java2Html.java b/src/main/java/me/coley/j2h/Java2Html.java
index e7c9707..3f2d849 100644
--- a/src/main/java/me/coley/j2h/Java2Html.java
+++ b/src/main/java/me/coley/j2h/Java2Html.java
@@ -311,6 +311,7 @@ private void updateLanguageMenu() {
 				}
 				return null;
 			});
+			Platform.runLater(() -> txtName.requestFocus());
 			Optional<String> result = dialog.showAndWait();
 			if(result.isPresent()) {
 				Language language = new Language(result.get());
@@ -378,6 +379,7 @@ private void updateThemeMenu() {
 				}
 				return null;
 			});
+			Platform.runLater(() -> txtName.requestFocus());
 			Optional<String> result = dialog.showAndWait();
 			if(result.isPresent()) {
 				Theme theme = new Theme();