diff --git a/Changelog b/Changelog
index 98f6b4252..86d5c263e 100644
--- a/Changelog
+++ b/Changelog
@@ -3,6 +3,8 @@
     - BUGFIX: Improved IPv6 support (IP filter and Peer list)
     - BUGFIX: Make IP filter more tolerant towards strangely formatted IPs
     - BUGFIX: More reliable folder scanning
+    - BUGFIX: Do not create the torrent root folder at final destination if
+    torrent is in the temp dir (closes #673271)
     - BUGFIX: Fix compilation with libnotify v0.7.0 (closes #671769)
     - BUGFIX: Use a pointing cursor over status bar buttons
 
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index fa6c86e5a..f61caa6fa 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -2203,7 +2203,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
         QTorrentHandle h(p->handle);
         if(h.is_valid()) {
           // Attempt to remove old folder if empty
-          const QString& old_save_path = TorrentPersistentData::getPreviousPath(h.hash());
+          const QString old_save_path = TorrentPersistentData::getPreviousPath(h.hash());
           const QString new_save_path = misc::toQStringU(p->path);
           qDebug("Torrent moved from %s to %s", qPrintable(old_save_path), qPrintable(new_save_path));
           QDir old_save_dir(old_save_path);
diff --git a/src/torrentpersistentdata.h b/src/torrentpersistentdata.h
index 1352f45b7..34246f40d 100644
--- a/src/torrentpersistentdata.h
+++ b/src/torrentpersistentdata.h
@@ -313,7 +313,7 @@ public:
     // Save persistent data
     QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent-resume"));
     QHash<QString, QVariant> all_data = settings.value("torrents", QHash<QString, QVariant>()).toHash();
-    QHash<QString, QVariant> data;
+    QHash<QString, QVariant> data = all_data.value(h.hash()).toHash();
     data["is_magnet"] = is_magnet;
     if(is_magnet) {
       data["magnet_uri"] = misc::toQString(make_magnet_uri(h.get_torrent_handle()));