diff --git a/src/gui/DatabaseSettingsWidget.cpp b/src/gui/DatabaseSettingsWidget.cpp
index fe87e959..d86a3f12 100644
--- a/src/gui/DatabaseSettingsWidget.cpp
+++ b/src/gui/DatabaseSettingsWidget.cpp
@@ -45,6 +45,8 @@ void DatabaseSettingsWidget::setForms(QString dbName, QString dbDescription,
         m_ui->recycleBinEnabledCheckBox->setCheckState(Qt::Unchecked);
     }
     m_ui->transformRoundsSpinBox->setValue(transformRounds);
+
+    m_ui->dbNameEdit->setFocus();
 }
 
 quint64 DatabaseSettingsWidget::transformRounds()
diff --git a/src/gui/EditEntryWidget.cpp b/src/gui/EditEntryWidget.cpp
index 32f415a2..5964c8ab 100644
--- a/src/gui/EditEntryWidget.cpp
+++ b/src/gui/EditEntryWidget.cpp
@@ -119,6 +119,8 @@ void EditEntryWidget::loadEntry(Entry* entry, bool create, const QString& groupN
     m_attachmentsModel->setEntryAttachments(m_entryAttachments);
 
     m_ui->categoryList->setCurrentRow(0);
+
+    m_mainUi->titleEdit->setFocus();
 }
 
 void EditEntryWidget::saveEntry()
diff --git a/src/gui/EditGroupWidget.cpp b/src/gui/EditGroupWidget.cpp
index 557a4b90..9b596a6b 100644
--- a/src/gui/EditGroupWidget.cpp
+++ b/src/gui/EditGroupWidget.cpp
@@ -51,6 +51,8 @@ void EditGroupWidget::loadGroup(Group* group, bool create)
 
     m_ui->editName->setText(m_group->name());
     m_ui->editNotes->setPlainText(m_group->notes());
+
+    m_ui->editName->setFocus();
 }
 
 void EditGroupWidget::save()