diff --git a/source/console/computer_group_dialog.cc b/source/console/computer_group_dialog.cc
index faf9729f5..6ce4bf443 100644
--- a/source/console/computer_group_dialog.cc
+++ b/source/console/computer_group_dialog.cc
@@ -130,6 +130,8 @@ ComputerGroupDialog::ComputerGroupDialog(QWidget* parent,
 
     ui.tree_category->setCurrentItem(general_item);
     ui.tree_category->expandAll();
+
+    ui.edit_name->setFocus();
 }
 
 //--------------------------------------------------------------------------------------------------