diff --git a/src/gui/ChangeMasterKeyWidget.cpp b/src/gui/ChangeMasterKeyWidget.cpp
index 0030e60b8..bbcbc7d5f 100644
--- a/src/gui/ChangeMasterKeyWidget.cpp
+++ b/src/gui/ChangeMasterKeyWidget.cpp
@@ -54,6 +54,8 @@ void ChangeMasterKeyWidget::clearForms()
     m_ui->keyFileGroup->setChecked(false);
     m_ui->togglePasswordButton->setChecked(true);
     // TODO clear m_ui->keyFileCombo
+
+    m_ui->enterPasswordEdit->setFocus();
 }
 
 CompositeKey ChangeMasterKeyWidget::newMasterKey()
diff --git a/src/gui/ChangeMasterKeyWidget.ui b/src/gui/ChangeMasterKeyWidget.ui
index 1ca147181..da7583666 100644
--- a/src/gui/ChangeMasterKeyWidget.ui
+++ b/src/gui/ChangeMasterKeyWidget.ui
@@ -151,6 +151,17 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>passwordGroup</tabstop>
+  <tabstop>enterPasswordEdit</tabstop>
+  <tabstop>repeatPasswordEdit</tabstop>
+  <tabstop>togglePasswordButton</tabstop>
+  <tabstop>keyFileGroup</tabstop>
+  <tabstop>keyFileCombo</tabstop>
+  <tabstop>browseKeyFileButton</tabstop>
+  <tabstop>createKeyFileButton</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>