diff --git a/widgets/Options.cpp b/widgets/Options.cpp
index ebf014fc..99918728 100644
--- a/widgets/Options.cpp
+++ b/widgets/Options.cpp
@@ -16,6 +16,7 @@
 #include <openssl/objects.h>
 #include <QFileDialog>
 #include <QToolTip>
+#include <QDir>
 
 Options::Options(QWidget *parent)
 	:QDialog(parent)
@@ -173,14 +174,14 @@ void Options::on_addButton_clicked(void)
 	QString fname;
 
 	fname = QFileDialog::getOpenFileName(this, l.caption,
-		getLibDir(), l.filter);
+		getLibDir(), l.filter, nullptr, QFileDialog::DontResolveSymlinks);
 
 	addLib(fname);
 }
 
 void Options::addLib(QString fname)
 {
-	fname = QFileInfo(fname).canonicalFilePath();
+	fname = QDir::cleanPath(fname);
 	pkcs11_lib *l = pkcs11::libraries.add_lib(fname);
 
 	if (searchP11 && l)
diff --git a/widgets/SearchPkcs11.cpp b/widgets/SearchPkcs11.cpp
index 848d9e4a..9d2281a4 100644
--- a/widgets/SearchPkcs11.cpp
+++ b/widgets/SearchPkcs11.cpp
@@ -39,7 +39,8 @@ SearchPkcs11::~SearchPkcs11()
 void SearchPkcs11::on_fileBut_clicked()
 {
 	QString s = QFileDialog::getExistingDirectory(this, QString(XCA_TITLE),
-		filename->text());
+		filename->text(),
+		QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
 
 	if (!s.isEmpty())
 		filename->setText(nativeSeparator(s));