diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 996f5c441..985a1eb2c 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -875,9 +875,9 @@ class TorrentManager(component.Component):
                 if torrent.options["download_location"] != move_path:
                     torrent.move_storage(move_path)
 
-            torrent.is_finished = True
             component.get("EventManager").emit(TorrentFinishedEvent(torrent_id))
 
+        torrent.is_finished = torrent.handle.is_seed()
         torrent.update_state()
 
         # Only save resume data if it was actually downloaded something. Helps