diff --git a/src/gui/components/cc_frm_window.cpp b/src/gui/components/cc_frm_window.cpp
index e808e28b1..a3a5ba43e 100644
--- a/src/gui/components/cc_frm_window.cpp
+++ b/src/gui/components/cc_frm_window.cpp
@@ -168,14 +168,10 @@ void CComponentsWindow::initWindowSize()
 	if (cc_parent)
 		return;
 
-	if (width == 0)
-		width = frameBuffer->getScreenWidth();
-	else if ((unsigned)width > frameBuffer->getScreenWidth())
+	if (width == 0 || (unsigned)width > frameBuffer->getScreenWidth())
 		width = frameBuffer->getScreenWidth();
 
-	if (height == 0)
-		height = frameBuffer->getScreenHeight();
-	else if((unsigned)height > frameBuffer->getScreenHeight())
+	if (height == 0 || (unsigned)height > frameBuffer->getScreenHeight())
 		height = frameBuffer->getScreenHeight();
 }