diff --git a/js/FeedTree.js b/js/FeedTree.js
index 489aedaf0..f89486332 100755
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -273,13 +273,15 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
 				setTimeout(() => {
 					$("headlines-frame").focus();
 
-					const node = treeNode.rowNode;
-					const tree = this.domNode;
+					if (treeNode) {
+						const node = treeNode.rowNode;
+						const tree = this.domNode;
 
-					if (node && tree) {
-						// scroll tree to selection if needed
-						if (node.offsetTop < tree.scrollTop || node.offsetTop > tree.scrollTop + tree.clientHeight) {
-							$("feedTree").scrollTop = node.offsetTop;
+						if (node && tree) {
+							// scroll tree to selection if needed
+							if (node.offsetTop < tree.scrollTop || node.offsetTop > tree.scrollTop + tree.clientHeight) {
+								$("feedTree").scrollTop = node.offsetTop;
+							}
 						}
 					}