diff --git a/src/menu.h b/src/menu.h
index 8bf691de..2c1093c1 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -265,6 +265,8 @@ template <class T> void Menu<T>::Refresh()
 		return;
 	}
 	int MaxBeginning = itsOptions.size() < itsHeight ? 0 : itsOptions.size()-itsHeight;
+	if (itsHighlight > itsBeginning+itsHeight-1)
+		itsBeginning = itsHighlight-itsHeight+1;
 	if (itsBeginning < 0)
 		itsBeginning = 0;
 	else if (itsBeginning > MaxBeginning)