diff --git a/src/gui/intlGUIEditBox.cpp b/src/gui/intlGUIEditBox.cpp
index f5ea5b47f..8b0f10721 100644
--- a/src/gui/intlGUIEditBox.cpp
+++ b/src/gui/intlGUIEditBox.cpp
@@ -1430,6 +1430,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