diff --git a/js/viewfeed.js b/js/viewfeed.js
index b62058ca8..cb9a3c646 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1275,9 +1275,9 @@ function headlines_scroll_handler(e) {
 		unpackVisibleHeadlines();
 
 		// set topmost child in the buffer as active
-		if (getInitParam("cdm_auto_catchup") == 1 &&
+		if (isCdmMode() && getInitParam("cdm_auto_catchup") == 1 &&
 				getSelectedArticleIds2().length <= 1 &&
-				(!isCdmMode() || getInitParam("cdm_expanded"))) {
+				getInitParam("cdm_expanded")) {
 			var rows = $$("#headlines-frame > div[id*=RROW]");
 
 			for (var i = 0; i < rows.length; i++) {