diff --git a/js/dictionaryBuilder.js b/js/dictionaryBuilder.js
index a8fc479..65730f6 100644
--- a/js/dictionaryBuilder.js
+++ b/js/dictionaryBuilder.js
@@ -122,6 +122,8 @@ function ShowWordEditForm(index) {
 
     SetPartsOfSpeech("partOfSpeech" + indexString);
     document.getElementById("partOfSpeech" + indexString).value = htmlEntitiesParse(word.partOfSpeech);
+
+    document.getElementById("word" + indexString).focus();
 }
 
 function CancelEditForm(index) {