diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index f9a955198..55f199baa 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -54,6 +54,7 @@
 				<input class=\"iedit\" onblur=\"javascript:enableHotkeys()\" 
 					onkeypress=\"return filterCR(event, qafAdd)\"
 					onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
+					onchange=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
 					onfocus=\"javascript:disableHotkeys()\" name=\"feed_url\"></td></tr>";
 		
 			if (get_pref($link, 'ENABLE_FEED_CATS')) {
@@ -92,6 +93,7 @@
 			
 			print "<input name=\"query\" class=\"iedit\" 
 				onkeypress=\"return filterCR(event, search)\"
+				onchange=\"toggleSubmitNotEmpty(this, 'search_submit_btn')\"
 				onkeyup=\"toggleSubmitNotEmpty(this, 'search_submit_btn')\"
 				value=\"\">
 			</td></tr>";
@@ -166,8 +168,9 @@
 
 			print "<tr><td>Caption:</td>
 				<td><input onkeypress=\"return filterCR(event, addLabel)\"
-					 onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
-					 name=\"description\" class=\"iedit\">";
+					onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+					onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+					name=\"description\" class=\"iedit\">";
 
 			print "</td></tr>";
 
@@ -228,7 +231,8 @@
 
 			print "<tr><td>Match:</td>
 				<td><input onkeypress=\"return filterCR(event, qaddFilter)\"
-					 onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+					onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+ 					onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
 					 name=\"reg_exp\" class=\"iedit\">";		
 
 			print "</td></tr><tr><td>On field:</td><td>";
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 1ea63c96f..f92902437 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -591,6 +591,7 @@
 				<input id=\"fadd_cat\" 
 					onkeypress=\"return filterCR(event, addFeedCat)\"
 					onkeyup=\"toggleSubmitNotEmpty(this, 'catadd_submit_btn')\"
+					onchange=\"toggleSubmitNotEmpty(this, 'catadd_submit_btn')\"
 					size=\"40\">&nbsp;
 				<input 
 					type=\"submit\" class=\"button\" disabled=\"true\" id=\"catadd_submit_btn\"
@@ -652,7 +653,8 @@
 		
 					if (!$edit_cat_id || $action != "edit") {
 		
-						print "<td width='5%' align='center'><input onclick='toggleSelectPrefRow(this, \"fcat\");' 
+						print "<td width='5%' align='center'><input 
+							onclick='toggleSelectPrefRow(this, \"fcat\");' 
 							type=\"checkbox\" id=\"FCCHK-".$line["id"]."\"></td>";
 		
 						print "<td><a href=\"javascript:editFeedCat($cat_id);\">" . 
@@ -756,6 +758,7 @@
 		print "<div class=\"prefGenericAddBox\">
 			<input id=\"fadd_link\" 
 				onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
+				onchange=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
 				size=\"40\">
 			<input type=\"submit\" class=\"button\"
 				disabled=\"true\" id=\"fadd_submit_btn\"
diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 14015b559..d66c9bed4 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -45,7 +45,8 @@
 			print "<tr><td>Match:</td>
 				<td><input onkeypress=\"return filterCR(event, filterEditSave)\"
 					 onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
-					name=\"reg_exp\" class=\"iedit\" value=\"$reg_exp\">";
+					 onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+					 name=\"reg_exp\" class=\"iedit\" value=\"$reg_exp\">";
 			
 			print "</td></tr><tr><td>On field:</td><td>";
 			
diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index 8f1bab7af..531764fef 100644
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -37,7 +37,8 @@
 
 			print "<tr><td>Caption:</td>
 				<td><input onkeypress=\"return filterCR(event, labelEditSave)\"
-					 onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+					onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+					onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
 					 name=\"description\" class=\"iedit\" value=\"$description\">";
 
 			print "</td></tr>";
diff --git a/modules/pref-users.php b/modules/pref-users.php
index c3b85219d..9835f4c19 100644
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -185,6 +185,7 @@
 		print "<div class=\"prefGenericAddBox\">
 			<input id=\"uadd_box\" 			
 				onkeyup=\"toggleSubmitNotEmpty(this, 'user_add_btn')\"
+				onchange=\"toggleSubmitNotEmpty(this, 'user_add_btn')\"
 				size=\"40\">&nbsp;";
 			
 		print "<input type=\"submit\" class=\"button\"