diff --git a/src/gui/components/cc_frm_button.cpp b/src/gui/components/cc_frm_button.cpp
index c0c0039b0..23d57bf3c 100644
--- a/src/gui/components/cc_frm_button.cpp
+++ b/src/gui/components/cc_frm_button.cpp
@@ -217,7 +217,7 @@ void CComponentsButton::initCaption()
 		 * These dimensions must be enough to display complete content like possible icon and without truncated text.
 		*/
 		Font *tmp_font = cc_btn_font;
-		if ((tmp_font->getHeight()-reduce) > (height-reduce) && (tmp_font->getRenderWidth(cc_btn_text)-reduce) > width-reduce)
+		if ((tmp_font->getHeight()-reduce) > (height-reduce) || (tmp_font->getRenderWidth(cc_btn_text)-reduce) > width-reduce)
 			tmp_font = *cc_btn_dy_font->getDynFont(w_cap, h_cap, cc_btn_text);
 		if ((cc_btn_font->getHeight()-reduce) > (height-reduce))
 			tmp_font = *cc_btn_dy_font->getDynFont(w_cap, h_cap, cc_btn_text);