diff --git a/feedlist.js b/feedlist.js
index 3874cceae..904638ce0 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -75,7 +75,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
 		var toolbar_form = document.forms["main_toolbar_form"];
 		var toolbar_query = Form.serialize("main_toolbar_form");
 
-		if (document.forms["main_toolbar_form"].query) {
+		if (toolbar_form.query) {
 			toolbar_form.query.value = "";
 		}
 
diff --git a/viewfeed.js b/viewfeed.js
index 66b899201..7106d781b 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -1248,10 +1248,17 @@ function headlines_scroll_handler() {
 
 		var e = document.getElementById("headlinesInnerContainer");
 
-		if (e.scrollTop + e.offsetHeight > e.scrollHeight - 50) {
-			if (!_infscroll_disable) {
-				debug("more cowbell!");
-				viewNextFeedPage();
+		// don't do infinite scrolling when Limit == All
+
+		var toolbar_form = document.forms["main_toolbar_form"];
+
+		var limit = toolbar_form.limit[toolbar_form.limit.selectedIndex];
+		if (limit.value != 0) {
+			if (e.scrollTop + e.offsetHeight > e.scrollHeight - 50) {
+				if (!_infscroll_disable) {
+					debug("more cowbell!");
+					viewNextFeedPage();
+				}
 			}
 		}