diff --git a/deluge/ui/web/js/deluge-all/FilterPanel.js b/deluge/ui/web/js/deluge-all/FilterPanel.js
index a68617055..80294404c 100644
--- a/deluge/ui/web/js/deluge-all/FilterPanel.js
+++ b/deluge/ui/web/js/deluge-all/FilterPanel.js
@@ -77,12 +77,6 @@ Deluge.FilterPanel = Ext.extend(Ext.Panel, {
 			}]
 		});
 		this.relayEvents(this.list, ['selectionchange']);
-		this.list.afterMethod('bindStore', this.doBindStore, this);
-	},
-
-	// private
-	doBindStore: function() {
-		this.list.select(0);
 	},
 
 	/**
@@ -160,6 +154,10 @@ Deluge.FilterPanel = Ext.extend(Ext.Panel, {
 		}, this);
 
 		store.commitChanges();
+
+		if (!this.list.getSelectionCount()) {
+			this.list.select(0);
+		}
 	},
 
 });