diff --git a/src/FinishedTorrents.cpp b/src/FinishedTorrents.cpp
index 6481e2129..291011eb8 100644
--- a/src/FinishedTorrents.cpp
+++ b/src/FinishedTorrents.cpp
@@ -267,7 +267,7 @@ void FinishedTorrents::updateFinishedList(){
       if (reponse == QMessageBox::Yes) {
         qDebug("Info: a torrent was moved from finished to download tab");
         deleteTorrent(hash);
-        BTSession->setFinishedTorrent(hash);
+        BTSession->setUnfinishedTorrent(hash);
         emit torrentMovedFromFinishedList(hash);
       }
       else if (reponse == QMessageBox::No) {
diff --git a/src/qtorrenthandle.cpp b/src/qtorrenthandle.cpp
index edd3b8aef..7b89e444e 100644
--- a/src/qtorrenthandle.cpp
+++ b/src/qtorrenthandle.cpp
@@ -57,6 +57,8 @@ float QTorrentHandle::progress() const {
   Q_ASSERT(h.is_valid());
   if(!h.status().total_wanted)
     return 0.;
+  if (h.status().total_wanted_done == h.status().total_wanted)
+    return 1.;
   float progress = (float)h.status().total_wanted_done/(float)h.status().total_wanted;
   Q_ASSERT(progress >= 0. && progress <= 1.);
   return progress;