diff --git a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
index 0ea7fb50..228c2876 100644
--- a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
@@ -269,8 +269,11 @@ class MainFrameView {
         selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
         selectionModel.addListSelectionListener({
             int selectedRow = selectedDownloaderRow()
-            if (selectedRow < 0)
+            if (selectedRow < 0) {
+                model.cancelButtonEnabled = false
+                model.retryButtonEnabled = false
                 return
+            }
             def downloader = model.downloads[selectedRow]?.downloader
             if (downloader == null)
                 return