diff --git a/css/litegraph.css b/css/litegraph.css
index 74989de286..32111b724d 100755
--- a/css/litegraph.css
+++ b/css/litegraph.css
@@ -253,6 +253,11 @@
 	vertical-align: top;
 }
 
+.graphdialog .helper {
+	overflow: auto;
+	max-height: 200px;
+}
+
 .graphdialog .help-item {
 	padding-left: 10px;
 }
diff --git a/src/litegraph.js b/src/litegraph.js
index 102f8dd1f7..ced595b807 100755
--- a/src/litegraph.js
+++ b/src/litegraph.js
@@ -5849,15 +5849,21 @@ LGraphCanvas.prototype.showSearchBox = function(event)
 
 	function changeSelection( forward )
 	{
+		var prev = selected;
 		if(selected)
 			selected.classList.remove("selected");
 		if(!selected)
-			selected = helper.childNodes[0];
+			selected = forward ? helper.childNodes[0] : helper.childNodes[ helper.childNodes.length ];
 		else
+		{
 			selected = forward ? selected.nextSibling : selected.previousSibling;
+			if(!selected)
+				selected = prev;
+		}
 		if(!selected)
 			return;
 		selected.classList.add("selected");
+		selected.scrollIntoView();
 	}
 
 	function refreshHelper()