diff --git a/Terminal.Gui/Views/ListView.cs b/Terminal.Gui/Views/ListView.cs
index 3413dfbf1..de6a56aea 100644
--- a/Terminal.Gui/Views/ListView.cs
+++ b/Terminal.Gui/Views/ListView.cs
@@ -679,9 +679,10 @@ namespace Terminal.Gui {
 
 		void EnsuresVisibilitySelectedItem ()
 		{
+			SuperView?.LayoutSubviews ();
 			if (selected < top) {
 				top = selected;
-			} else if (selected >= top + Frame.Height) {
+			} else if (Frame.Height > 0 && selected >= top + Frame.Height) {
 				top = Math.Max (selected - Frame.Height + 2, 0);
 			}
 		}