diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp
index f1547806b..83cc5231a 100644
--- a/src/gui/widget/hintbox.cpp
+++ b/src/gui/widget/hintbox.cpp
@@ -441,11 +441,11 @@ void CHintBox::scroll_down(const uint& hint_id)
 
 int CHintBox::getMaxWidth(const string& Text, const string& Title, Font *font, const int& minWidth)
 {
-	int res = max(HINTBOX_MIN_WIDTH, max(minWidth+2*w_indentation, min(CTextBox::getMaxLineWidth(Text, font)+2*w_indentation, (int)frameBuffer->getScreenWidth())));
+	int res = max(HINTBOX_MIN_WIDTH, max(minWidth+2*w_indentation, min(CTextBox::getMaxLineWidth(Text, font)+2*w_indentation, (int)frameBuffer->getScreenWidth() - shadow_w)));
 	if (ccw_show_header){
 		initHeader();
 		int max_title_width = max(res, ccw_head->getCaptionFont()->getRenderWidth(Title) + 2*w_indentation);
-		return min(max_title_width, (int)frameBuffer->getScreenWidth());
+		return min(max_title_width, (int)frameBuffer->getScreenWidth() - shadow_w);
 	}
 
 	return res;