diff --git a/backend.php b/backend.php
index 267cc7dc9..d203af3fa 100644
--- a/backend.php
+++ b/backend.php
@@ -1982,6 +1982,8 @@
 
 			if (db_num_rows($result) != 0) {
 	
+				print "<form id=\"feed_cat_edit_form\">";
+				
 				print "<p><table width=\"100%\" class=\"prefFeedCatList\" 
 					cellspacing=\"0\" id=\"prefFeedCatList\">";
 
@@ -2005,9 +2007,13 @@
 		
 					$edit_cat_id = $_GET["id"];
 		
-					if ($subop == "editCat" && $cat_id != $edit_cat_id) {
-						$class .= "Grayed";
-						$this_row_id = "";
+					if ($subop == "editCat") {
+						if ($cat_id != $edit_cat_id) {
+							$class .= "Grayed";
+							$this_row_id = "";
+						} else {
+							$class .= "Selected";
+						}
 					} else {
 						$this_row_id = "id=\"FCATR-$cat_id\"";
 					}
@@ -2026,16 +2032,22 @@
 		
 					} else if ($cat_id != $edit_cat_id) {
 		
-						print "<td><input disabled=\"true\" type=\"checkbox\" 
+						print "<td align='center'><input disabled=\"true\" type=\"checkbox\" 
 							id=\"FRCHK-".$line["id"]."\"></td>";
 		
 						print "<td>$edit_title</td>";		
 		
 					} else {
 		
-						print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
+						print "<td align='center'><input disabled=\"true\" type=\"checkbox\" checked>";
+						
+						print "<input type=\"hidden\" name=\"id\" value=\"$cat_id\">";
+						print "<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">";
+						print "<input type=\"hidden\" name=\"subop\" value=\"saveCat\">";
+					
+						print "</td>";
 		
-						print "<td><input id=\"iedit_title\" value=\"$edit_title\"></td>";
+						print "<td><input name=\"title\" class=\"iedit\" value=\"$edit_title\"></td>";
 						
 					}
 					
@@ -2045,15 +2057,17 @@
 				}
 	
 				print "</table>";
+
+				print "</form>";
 	
 				print "<p id=\"catOpToolbar\">";
 	
 				if ($subop == "editCat") {
 					print "Edit category:&nbsp;
 						<input type=\"submit\" class=\"button\"
-							onclick=\"javascript:feedCatEditCancel()\" value=\"Cancel\">
+							onclick=\"javascript:feedCatEditSave()\" value=\"Save\">
 						<input type=\"submit\" class=\"button\"
-							onclick=\"javascript:feedCatEditSave()\" value=\"Save\">";
+							onclick=\"javascript:feedCatEditCancel()\" value=\"Cancel\">";
 					} else {
 		
 					print "
diff --git a/prefs.js b/prefs.js
index ec65e8399..c98dbcc8d 100644
--- a/prefs.js
+++ b/prefs.js
@@ -719,11 +719,11 @@ function feedCatEditSave() {
 
 	notify("Saving category...");
 
-	var cat_title = document.getElementById("iedit_title").value;
+//	var cat_title = document.getElementById("iedit_title").value;
 
-	xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=saveCat&id=" +
-		param_escape(active_feed_cat) + "&title=" + param_escape(cat_title), 
-		true);
+	var query = Form.serialize("feed_cat_edit_form");
+
+	xmlhttp.open("GET", "backend.php?" + query, true);
 	xmlhttp.onreadystatechange=feedlist_callback;
 	xmlhttp.send(null);
 
diff --git a/tt-rss.css b/tt-rss.css
index f9e109df6..a59779737 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -287,11 +287,15 @@ a:hover {
 	background-color : #f0fff0;
 }
 
-.iedit {
+input.iedit {
 	width : 100%;
 	padding-left : 2px;
 }
 
+select.iedit {
+	width : 100%;
+}
+
 input.editbox {
 	width : 200px;
 	padding-left : 2px;