diff --git a/program/js/list.js b/program/js/list.js
index d54b59d24..476edae4b 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -1035,7 +1035,7 @@ invert_selection: function()
 /**
  * Unselect selected row(s)
  */
-clear_selection: function(id)
+clear_selection: function(id, no_event)
 {
   var n, num_select = this.selection.length;
 
@@ -1057,7 +1057,7 @@ clear_selection: function(id)
     this.selection = [];
   }
 
-  if (num_select && !this.selection.length)
+  if (num_select && !this.selection.length && !no_event)
     this.triggerEvent('select');
 },
 
@@ -1110,7 +1110,7 @@ highlight_row: function(id, multiple, norecur)
 
   if (!multiple) {
     if (this.selection.length > 1 || !this.in_selection(id)) {
-      this.clear_selection();
+      this.clear_selection(null, true);
       this.selection[0] = id;
       $(this.rows[id].obj).addClass('selected');
     }