diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp
index 6e24de5e7..781b836fd 100644
--- a/src/gui/DatabaseOpenWidget.cpp
+++ b/src/gui/DatabaseOpenWidget.cpp
@@ -58,6 +58,12 @@ DatabaseOpenWidget::~DatabaseOpenWidget()
 {
 }
 
+void DatabaseOpenWidget::showEvent(QShowEvent* event)
+{
+    DialogyWidget::showEvent(event);
+    m_ui->editPassword->setFocus();
+}
+
 void DatabaseOpenWidget::load(const QString& filename)
 {
     m_filename = filename;
diff --git a/src/gui/DatabaseOpenWidget.h b/src/gui/DatabaseOpenWidget.h
index ba55e4c4a..34f401a09 100644
--- a/src/gui/DatabaseOpenWidget.h
+++ b/src/gui/DatabaseOpenWidget.h
@@ -45,6 +45,7 @@ Q_SIGNALS:
     void editFinished(bool accepted);
 
 protected:
+    void showEvent(QShowEvent* event) override;
     CompositeKey databaseKey();
 
 protected Q_SLOTS:
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 31843cc5b..ed58f69ea 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -333,15 +333,6 @@ void MainWindow::openDatabase(const QString& fileName, const QString& pw, const
     m_ui->tabWidget->openDatabase(fileName, pw, keyFile);
 }
 
-void MainWindow::minimizeWindow()
-{
-    if (isTrayIconEnabled() && config()->get("GUI/MinimizeToTray").toBool()) {
-        hide();
-    } else {
-        setWindowState(Qt::WindowMinimized);
-    }
-}
-
 void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
 {
     int currentIndex = m_ui->stackedWidget->currentIndex();
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index be1580da6..cf2c9cd96 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -38,7 +38,6 @@ class MainWindow : public QMainWindow
 public:
     MainWindow();
     ~MainWindow();
-    void minimizeWindow();
 
 public Q_SLOTS:
     void openDatabase(const QString& fileName, const QString& pw = QString(),
diff --git a/src/main.cpp b/src/main.cpp
index f9f2b1f9a..a94d65eaa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -91,6 +91,11 @@ int main(int argc, char** argv)
     
     QObject::connect(&app, SIGNAL(openFile(QString)), &mainWindow, SLOT(openDatabase(QString)));
     
+    // start minimized if configured
+    if (config()->get("GUI/MinimizeOnStartup").toBool()) {
+        mainWindow.setWindowState(Qt::WindowMinimized);
+    }
+    
     for (int ii=0; ii < args.length(); ii++) {
         QString filename = args[ii];
         if (!filename.isEmpty() && QFile::exists(filename)) {
@@ -112,10 +117,5 @@ int main(int argc, char** argv)
         }
     }
     
-    // start minimized if configured
-    if (config()->get("GUI/MinimizeOnStartup").toBool()) {
-        mainWindow.minimizeWindow();
-    }
-    
     return app.exec();
 }