diff --git a/webui/src/main/java/com/muwire/webui/DownloadManager.java b/webui/src/main/java/com/muwire/webui/DownloadManager.java
index 5f833998..a8cb4ce4 100644
--- a/webui/src/main/java/com/muwire/webui/DownloadManager.java
+++ b/webui/src/main/java/com/muwire/webui/DownloadManager.java
@@ -30,7 +30,8 @@ public class DownloadManager {
     }
     
     public boolean isDownloading(InfoHash infoHash) {
-        return downloaders.containsKey(infoHash);
+        return downloaders.containsKey(infoHash) &&
+                downloaders.get(infoHash).getCurrentState() != Downloader.DownloadState.CANCELLED;
     }
     
     void cancel(InfoHash infoHash) {