diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index 09fac0c22..7c9cf878a 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -486,29 +486,32 @@ QRect MainWindow::countInitialGeometry(Core::WindowPosition position) {
 	if (!screen) {
 		return initial;
 	}
-	const auto frame = [&] {
-		if (!Core::App().settings().nativeWindowFrame()) {
-			return QMargins();
-		}
-		const auto inner = geometry();
-		const auto outer = frameGeometry();
-		return QMargins(
-			inner.x() - outer.x(),
-			inner.y() - outer.y(),
-			outer.x() + outer.width() - inner.x() - inner.width(),
-			outer.y() + outer.height() - inner.y() - inner.height());
-	}();
-
+	const auto frame = frameMargins();
 	const auto screenGeometry = screen->geometry();
 	const auto availableGeometry = screen->availableGeometry();
-	const auto spaceForInner = availableGeometry.marginsRemoved(
-		frame);
+	const auto spaceForInner = availableGeometry.marginsRemoved(frame);
 	DEBUG_LOG(("Window Pos: "
-		"Screen found, screen geometry: %1, %2, %3, %4"
+		"Screen found, screen geometry: %1, %2, %3, %4, "
+		"available: %5, %6, %7, %8"
 		).arg(screenGeometry.x()
 		).arg(screenGeometry.y()
 		).arg(screenGeometry.width()
-		).arg(screenGeometry.height()));
+		).arg(screenGeometry.height()
+		).arg(availableGeometry.x()
+		).arg(availableGeometry.y()
+		).arg(availableGeometry.width()
+		).arg(availableGeometry.height()));
+	DEBUG_LOG(("Window Pos: "
+		"Window frame margins: %1, %2, %3, %4, "
+		"available space for inner geometry: %5, %6, %7, %8"
+		).arg(frame.left()
+		).arg(frame.top()
+		).arg(frame.right()
+		).arg(frame.bottom()
+		).arg(spaceForInner.x()
+		).arg(spaceForInner.y()
+		).arg(spaceForInner.width()
+		).arg(spaceForInner.height()));
 
 	const auto x = spaceForInner.x() - screenGeometry.x();
 	const auto y = spaceForInner.y() - screenGeometry.y();
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index b35d2d257..2d53ef070 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit b35d2d257a421f6adce0e60d62126ee65f46f573
+Subproject commit 2d53ef070f3dee5f36246c2c7ce830f755847344