diff --git a/app/qml/InsertNameDialog.qml b/app/qml/InsertNameDialog.qml
index fb4d7e9..7897e65 100644
--- a/app/qml/InsertNameDialog.qml
+++ b/app/qml/InsertNameDialog.qml
@@ -82,11 +82,15 @@ Window {
                         nameSelected(name)
                         close()
                     }
+                    nameField.forceActiveFocus()
                 }
             }
             Button {
                 text: qsTr("Cancel")
-                onClicked: close()
+                onClicked: function() {
+                    nameField.forceActiveFocus()
+                    close()
+                }
             }
         }
     }