diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 18107f956..ab2ac0849 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -768,11 +768,12 @@
 				onclick=\"addFeed()\" value=\"".__('Subscribe')."\">"; */
 
 		print "<input onclick=\"javascript:displayDlg('quickAddFeed')\"
-			type=\"submit\" id=\"fadd_subscribe_btn\" 
+			type=\"submit\" id=\"subscribe_to_feed_btn\" 
 			class=\"button\" value=\"".__('Subscribe to feed')."\">"; 
 
 		if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
 			print " <input type=\"submit\" class=\"button\"
+				id=\"top25_feeds_btn\"
 				onclick=\"javascript:browseFeeds()\" value=\"".__('Top 25')."\">";
 		}
 
diff --git a/prefs.js b/prefs.js
index 6901b08cf..30a8928d7 100644
--- a/prefs.js
+++ b/prefs.js
@@ -408,6 +408,14 @@ function editFeed(feed) {
 
 	notify_progress("Loading, please wait...");
 
+	document.getElementById("subscribe_to_feed_btn").disabled = true;
+
+	try {
+		document.getElementById("top25_feeds_btn").disabled = true;
+	} catch (e) {
+		// this button is not always available, no-op if not found
+	}
+
 	// clean selection from all rows & select row being edited
 	selectTableRowsByIdPrefix('prefFeedList', 'FEEDR-', 'FRCHK-', false);
 	selectTableRowById('FEEDR-'+feed, 'FRCHK-'+feed, true);
@@ -637,6 +645,14 @@ function feedEditCancel() {
 		return
 	}
 
+	document.getElementById("subscribe_to_feed_btn").disabled = false;
+
+	try {
+		document.getElementById("top25_feeds_btn").disabled = false;
+	} catch (e) {
+		// this button is not always available, no-op if not found
+	}
+
 	closeInfoBox();
 
 	selectPrefRows('feed', false); // cleanup feed selection
@@ -1633,6 +1649,14 @@ function editFeedCats() {
 		return
 	}
 
+	document.getElementById("subscribe_to_feed_btn").disabled = true;
+
+	try {
+		document.getElementById("top25_feeds_btn").disabled = true;
+	} catch (e) {
+		// this button is not always available, no-op if not found
+	}
+
 	xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editCats", true);
 	xmlhttp.onreadystatechange=infobox_callback;
 	xmlhttp.send(null);
diff --git a/tt-rss.css b/tt-rss.css
index f834ff308..f8ada76dd 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -438,7 +438,7 @@ table.prefFeedList td.feedSelect {
 div.prefFeedCatHolder {
 	height : 250px;
 	overflow : auto;
-	border : 1px solid #88b0f0;
+	border : 1px solid #99d67a;
 	margin : 5px 0px 5px 0px;
 }