diff --git a/src/gui/components/components.cpp b/src/gui/components/components.cpp
index 2a07d4e76..a861d17e3 100644
--- a/src/gui/components/components.cpp
+++ b/src/gui/components/components.cpp
@@ -994,8 +994,6 @@ void CComponentsItemBox::calculateElementsInitPart1()
 		if (v_element_data[i].type != CC_ITEMBOX_PICTURE)
 			hMax = max(v_element_data[i].height, hMax);
 	}
-	if (!has_TextElement)
-		hMax = max(font_text->getHeight(), hMax);
 }
 
 void CComponentsItemBox::calculateElementsInitPart2()
@@ -1157,6 +1155,10 @@ void CComponentsTitleBar::calculateElements()
 
 	calculateElementsInitPart1();
 
+	// hMax correction if no text element.
+	if (!has_TextElement)
+		hMax = max(font_text->getHeight(), hMax);
+
 	// Calculate logo
 	for (i = 0; i < v_element_data.size(); i++) {
 		if (v_element_data[i].type == CC_ITEMBOX_PICTURE) {