diff --git a/tt-rss.php b/tt-rss.php
index 98e68af4b..5dc2a7244 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -204,7 +204,8 @@
 		<div id="headlines-toolbar" dojoType="dijit.layout.ContentPane" region="top">
 		</div>
 
-		<div id="headlines-frame" dojoType="dijit.layout.ContentPane" region="center">
+		<div id="headlines-frame" dojoType="dijit.layout.ContentPane" 
+				onscroll="headlines_scroll_handler(this)" region="center">
 			<div id="headlinesInnerContainer">
 				<div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
 			</div>
diff --git a/viewfeed.js b/viewfeed.js
index 22465013e..99e8dffcf 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -133,7 +133,7 @@ function headlines_callback2(transport, feed_cur_page) {
 
 						var ids = getSelectedArticleIds2();
 	
-						c.innerHTML = c.innerHTML + headlines.firstChild.nodeValue;
+						c.innerHTML = c.innerHTML + headlines_content.firstChild.nodeValue;
 
 						console.log("restore selected ids: " + ids);
 
@@ -1513,16 +1513,9 @@ function postMouseOut(id) {
 	}
 }
 
-function headlines_scroll_handler() {
+function headlines_scroll_handler(e) {
 	try {
 
-		var e = $("headlinesInnerContainer");
-
-		var toolbar_form = document.forms["main_toolbar_form"];
-
-//		console.log((e.scrollTop + e.offsetHeight) + " vs " + e.scrollHeight + " dis? " +
-//			_infscroll_disable);
-
 		if (e.scrollTop + e.offsetHeight > e.scrollHeight - 100) {
 			if (!_infscroll_disable) {
 				viewNextFeedPage();