diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp
index a409aadc3..7190fb389 100644
--- a/src/gui/DatabaseOpenWidget.cpp
+++ b/src/gui/DatabaseOpenWidget.cpp
@@ -204,9 +204,14 @@ void DatabaseOpenWidget::openDatabase()
 
     m_db.reset(new Database());
     QString error;
+
     QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+    m_ui->passwordFormFrame->setEnabled(false);
+    QCoreApplication::processEvents();
     bool ok = m_db->open(m_filename, masterKey, &error, false);
     QApplication::restoreOverrideCursor();
+    m_ui->passwordFormFrame->setEnabled(true);
+
     if (!ok) {
         if (m_ui->editPassword->text().isEmpty() && !m_retryUnlockWithEmptyPassword) {
             QScopedPointer<QMessageBox> msgBox(new QMessageBox(this));
diff --git a/src/gui/DatabaseOpenWidget.ui b/src/gui/DatabaseOpenWidget.ui
index 14a1337c6..60b2feadc 100644
--- a/src/gui/DatabaseOpenWidget.ui
+++ b/src/gui/DatabaseOpenWidget.ui
@@ -132,7 +132,7 @@
             <number>15</number>
            </property>
            <item>
-            <widget class="QFrame" name="verticalFrame">
+            <widget class="QFrame" name="passwordFormFrame">
              <property name="minimumSize">
               <size>
                <width>400</width>