diff --git a/gui/widgets/grid.cpp b/gui/widgets/grid.cpp
index bd6bf13aa07..dce02aebd98 100644
--- a/gui/widgets/grid.cpp
+++ b/gui/widgets/grid.cpp
@@ -75,7 +75,8 @@ void GridItemWidget::move(int x, int y) {
 
 void GridItemWidget::drawWidget() {
 	if (_activeEntry->isHeader) {
-		g_gui.theme()->drawFoldIndicator(Common::Rect(_x - _h, _y, _x, _y + _h), _grid->groupExpanded(_activeEntry->entryID));
+		const int indicatorSize = MIN((int)_h, _grid->_scrollWindowPaddingX);
+		g_gui.theme()->drawFoldIndicator(Common::Rect(_x - indicatorSize, _y, _x, _y + indicatorSize), _grid->groupExpanded(_activeEntry->entryID));
 		g_gui.theme()->drawText(Common::Rect(_x, _y, _x + _w, _y + _h), Common::U32String(_activeEntry->title),
 								ThemeEngine::kStateEnabled, Graphics::kTextAlignLeft, ThemeEngine::kTextInversionFocus, _h, false);
 		return;