diff --git a/gui/griffon-app/views/com/muwire/gui/SearchTabView.groovy b/gui/griffon-app/views/com/muwire/gui/SearchTabView.groovy
index 4ac99f46..0d159fd8 100644
--- a/gui/griffon-app/views/com/muwire/gui/SearchTabView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/SearchTabView.groovy
@@ -96,11 +96,12 @@ class SearchTabView {
             selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
             selectionModel.addListSelectionListener( {
                 int row = resultsTable.getSelectedRow()
-                if (row < 0)
+                if (row < 0) {
+                    model.downloadActionEnabled = false
                     return
+                }
                 if (lastSortEvent != null)
                     row = resultsTable.rowSorter.convertRowIndexToModel(row)
-                model.trustButtonsEnabled = true
                 model.downloadActionEnabled = mvcGroup.parentGroup.model.canDownload(model.results[row].infohash)
             })
         }