diff --git a/PrefFilterTree.js b/PrefFilterTree.js
index 6f38f8db2..a4cf3dac8 100644
--- a/PrefFilterTree.js
+++ b/PrefFilterTree.js
@@ -48,13 +48,5 @@ dojo.declare("fox.PrefFilterTree", lib.CheckBoxTree, {
 		return (!item.error || item.error == '') ? "dijitTreeRow" : 
 			"dijitTreeRow Error";
 	},
-	onClick: function (item) {
-		var id = String(item.id);
-		var bare_id = id.substr(id.indexOf(':')+1);
-
-		if (id.match('FILTER:')) {
-			editFilter(bare_id, event);
-		}			
-	},
 });
 
diff --git a/PrefLabelTree.js b/PrefLabelTree.js
index 47e18780a..05a0c15b6 100644
--- a/PrefLabelTree.js
+++ b/PrefLabelTree.js
@@ -39,13 +39,5 @@ dojo.declare("fox.PrefLabelTree", lib.CheckBoxTree, {
 	getIconClass: function (item, opened) {
 		return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible";
 	}, 
-	onClick: function (item) {
-		var id = String(item.id);
-		var bare_id = id.substr(id.indexOf(':')+1);
-
-		if (id.match('LABEL:')) {
-			editLabel(bare_id, event);
-		}			
-	},
 });
 
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index d4bde4892..2c4503592 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1220,9 +1220,9 @@
 			var bare_id = id.substr(id.indexOf(':')+1);
 
 			if (id.match('FEED:')) {
-				editFeed(bare_id, event);
+				editFeed(bare_id);
 			} else if (id.match('CAT:')) {
-				editCat(bare_id, item, event);
+				editCat(bare_id, item);
 			}			
 		</script>
 		<script type=\"dojo/method\" event=\"onLoad\" args=\"item\">
diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index cf44c55f9..805562d9b 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -435,6 +435,15 @@
 		<script type=\"dojo/method\" event=\"onLoad\" args=\"item\">
 			Element.hide(\"filterlistLoading\");
 		</script>
+		<script type=\"dojo/method\" event=\"onClick\" args=\"item\">
+			var id = String(item.id);
+			var bare_id = id.substr(id.indexOf(':')+1);
+
+			if (id.match('FILTER:')) {
+				editFilter(bare_id);
+			}			
+		</script>
+
 		</div>";
 
 		print "</div>"; #pane
diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index e381d72ff..72e6dd1e3 100644
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -304,6 +304,14 @@
 		<script type=\"dojo/method\" event=\"onLoad\" args=\"item\">
 			Element.hide(\"labellistLoading\");
 		</script>
+		<script type=\"dojo/method\" event=\"onClick\" args=\"item\">
+			var id = String(item.id);
+			var bare_id = id.substr(id.indexOf(':')+1);
+
+			if (id.match('LABEL:')) {
+				editLabel(bare_id);
+			}			
+		</script>
 		</div>";
 
 		print "</div>"; #pane
diff --git a/prefs.js b/prefs.js
index 0eb570f5f..55e29d2af 100644
--- a/prefs.js
+++ b/prefs.js
@@ -166,7 +166,7 @@ function editUser(id, event) {
 		
 }
 
-function editFilter(id, event) {
+function editFilter(id) {
 	try {
 
 		var query = "backend.php?op=pref-filters&subop=edit&id=" + param_escape(id);