diff --git a/src/intlGUIEditBox.cpp b/src/intlGUIEditBox.cpp
index ad59ef13a..74b9f634c 100644
--- a/src/intlGUIEditBox.cpp
+++ b/src/intlGUIEditBox.cpp
@@ -1418,6 +1418,9 @@ void intlGUIEditBox::calculateScrollPos()
 		// todo: adjust scrollbar
 	}
 
+	if (!WordWrap && !MultiLine)
+		return;
+
 	// vertical scroll position
 	if (FrameRect.LowerRightCorner.Y < CurrentTextRect.LowerRightCorner.Y)
 		VScrollPos += CurrentTextRect.LowerRightCorner.Y - FrameRect.LowerRightCorner.Y; // scrolling downwards