diff --git a/src/previewselect.cpp b/src/previewselect.cpp
index 1867430dc..5ba887298 100644
--- a/src/previewselect.cpp
+++ b/src/previewselect.cpp
@@ -99,9 +99,10 @@ void PreviewSelect::on_previewButton_clicked() {
   // Flush data
   h.flush_cache();
 
+  QStringList absolute_paths(h.absolute_files_path());
   QString path;
   foreach (index, selectedIndexes) {
-    path = h.absolute_files_path().at(indexes.at(index.row()));
+    path = absolute_paths.at(indexes.at(index.row()));
     // File
     if (QFile::exists(path)) {
       emit readyToPreviewFile(path);
diff --git a/src/qtlibtorrent/qbtsession.cpp b/src/qtlibtorrent/qbtsession.cpp
index da8334287..788759a0a 100755
--- a/src/qtlibtorrent/qbtsession.cpp
+++ b/src/qtlibtorrent/qbtsession.cpp
@@ -1270,20 +1270,11 @@ void QBtSession::loadTorrentTempData(QTorrentHandle &h, QString savePath, bool m
       // Update file names
       const QStringList files_path = TorrentTempData::getFilesPath(hash);
       bool force_recheck = false;
+      QDir  base_dir(h.save_path());
       if (files_path.size() == h.num_files()) {
         for (int i=0; i<h.num_files(); ++i) {
-          QString old_path = h.absolute_files_path().at(i);
-          old_path.replace("\\", "/");
-          if (!QFile::exists(old_path)) {
-            // Remove old parent folder manually since we will
-            // not get a file_renamed alert
-            QStringList parts = old_path.split("/", QString::SkipEmptyParts);
-            parts.removeLast();
-            if (!parts.empty())
-              QDir().rmpath(parts.join("/"));
-          }
           const QString &path = files_path.at(i);
-          if (!force_recheck && QDir(h.save_path()).exists(path))
+          if (!force_recheck && base_dir.exists(path))
             force_recheck = true;
           qDebug("Renaming file to %s", qPrintable(path));
           h.rename_file(i, path);