diff --git a/src/properties/propertieswidget.cpp b/src/properties/propertieswidget.cpp
index 39dc0fc2a..a0d091073 100644
--- a/src/properties/propertieswidget.cpp
+++ b/src/properties/propertieswidget.cpp
@@ -463,11 +463,14 @@ void PropertiesWidget::openFolder(const QModelIndex &index, bool containing_fold
 
   const QDir saveDir(h.save_path());
   const QString filename = path_items.join("/");
-  const QString file_path = fsutils::expandPath(saveDir.absoluteFilePath(filename));
-  qDebug("Trying to open folder at %s", qPrintable(file_path));
   // Flush data
   h.flush_cache();
 
+  QString file_path = fsutils::expandPath(saveDir.absoluteFilePath(filename));
+  if (QFile::exists(file_path + ".!qB"))
+      file_path += ".!qB";
+  qDebug("Trying to open folder at %s", qPrintable(file_path));
+
 #ifdef Q_OS_WIN
   if (containing_folder) {
     // Syntax is: explorer /select, "C:\Folder1\Folder2\file_to_select"
diff --git a/src/qtlibtorrent/qbtsession.cpp b/src/qtlibtorrent/qbtsession.cpp
index cb2485f55..c8dfd4c70 100755
--- a/src/qtlibtorrent/qbtsession.cpp
+++ b/src/qtlibtorrent/qbtsession.cpp
@@ -1755,10 +1755,7 @@ bool QBtSession::isFilePreviewPossible(const QString &hash) const {
   }
   const unsigned int nbFiles = h.num_files();
   for (unsigned int i=0; i<nbFiles; ++i) {
-    QString filename = h.filename_at(i);
-    if (filename.endsWith(".!qB"))
-      filename.chop(4);
-    const QString extension = fsutils::fileExtension(filename);
+    const QString extension = fsutils::fileExtension(h.filename_at(i));
     if (misc::isPreviewable(extension))
       return true;
   }