diff --git a/src/libgui/importAddressListWizard/FileNamePage.cpp b/src/libgui/importAddressListWizard/FileNamePage.cpp
index 78695e069..479c46521 100644
--- a/src/libgui/importAddressListWizard/FileNamePage.cpp
+++ b/src/libgui/importAddressListWizard/FileNamePage.cpp
@@ -47,21 +47,15 @@ FileNamePage::FileNamePage(QWidget *parent) : QWizardPage(parent)
 
 void FileNamePage::selectAddressListFile()
 {
-    QString dir;
-    dir = st->getWDir();
-    if (dir.isEmpty())  dir = st->getOpenFileDir();
-    if (dir.isEmpty())  dir = "~";
-
     QString s = QFileDialog::getOpenFileName(
                     this,
                     "Choose a file",
-                    dir,
+                    st->getOpenFileDir(),
                     "All files (*)");
+    if (s.isEmpty()) return;
+    st->setOpenFileDir(s);
 
-    if (!s.isEmpty())
-    {
-        m_dialog->fileName->setText(s);
-    }
+    m_dialog->fileName->setText(s);
 }
 
 bool FileNamePage::validatePage()
diff --git a/src/libgui/importFirewallConfigurationWizard/IC_FileNamePage.cpp b/src/libgui/importFirewallConfigurationWizard/IC_FileNamePage.cpp
index 51c50cdc4..c6b9cc593 100644
--- a/src/libgui/importFirewallConfigurationWizard/IC_FileNamePage.cpp
+++ b/src/libgui/importFirewallConfigurationWizard/IC_FileNamePage.cpp
@@ -44,21 +44,16 @@ IC_FileNamePage::IC_FileNamePage(QWidget *parent) : QWizardPage(parent)
 
 void IC_FileNamePage::selectFile()
 {
-    QString dir;
-    dir = st->getWDir();
-    if (dir.isEmpty())  dir = st->getOpenFileDir();
-    if (dir.isEmpty())  dir = "~";
-
     QString s = QFileDialog::getOpenFileName(
         this,
         "Choose file",
-        dir,
+        st->getOpenFileDir(),
         "All files (*)");
 
-    if (!s.isEmpty())
-    {
-        m_dialog->fileName->setText(s);
-    }
+    if (s.isEmpty()) return;
+    st->setOpenFileDir(s);
+
+    m_dialog->fileName->setText(s);
 }
 
 bool IC_FileNamePage::validatePage()