diff --git a/src/gui/DatabaseOpenDialog.cpp b/src/gui/DatabaseOpenDialog.cpp
index 829d64541..5ab0f479c 100644
--- a/src/gui/DatabaseOpenDialog.cpp
+++ b/src/gui/DatabaseOpenDialog.cpp
@@ -55,6 +55,8 @@ DatabaseOpenDialog::DatabaseOpenDialog(QFile* file, QString filename, QWidget* p
         m_ui->checkKeyFile->setChecked(true);
         m_ui->comboKeyFile->addItem(lastKeyFiles[m_filename].toString());
     }
+
+    m_ui->editPassword->setFocus();
 }
 
 DatabaseOpenDialog::~DatabaseOpenDialog()
diff --git a/src/gui/DatabaseOpenDialog.ui b/src/gui/DatabaseOpenDialog.ui
index 58932bbac..86c04d9c1 100644
--- a/src/gui/DatabaseOpenDialog.ui
+++ b/src/gui/DatabaseOpenDialog.ui
@@ -88,6 +88,15 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>checkPassword</tabstop>
+  <tabstop>editPassword</tabstop>
+  <tabstop>buttonTogglePassword</tabstop>
+  <tabstop>checkKeyFile</tabstop>
+  <tabstop>comboKeyFile</tabstop>
+  <tabstop>buttonBrowseFile</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>