diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index 5c148558a2..0fc89fccb2 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -461,6 +461,7 @@ void MainWindow::recountGeometryConstraints() {
 }
 
 void MainWindow::initSize() {
+	updateShadowSize();
 	updateMinimumSize();
 
 	if (initSizeFromSystem()) {
@@ -562,6 +563,7 @@ void MainWindow::initSize() {
 		}
 		maximized = position.maximized;
 	}
+	geometry += _padding;
 	DEBUG_LOG(("Window Pos: Setting first %1, %2, %3, %4").arg(geometry.x()).arg(geometry.y()).arg(geometry.width()).arg(geometry.height()));
 	setGeometry(geometry);
 }
@@ -679,7 +681,7 @@ void MainWindow::savePosition(Qt::WindowState state) {
 		realPosition.maximized = 1;
 		DEBUG_LOG(("Window Pos: Saving maximized position."));
 	} else {
-		auto r = geometry();
+		auto r = geometry().marginsRemoved(_padding);
 		realPosition.x = r.x();
 		realPosition.y = r.y();
 		realPosition.w = r.width() - (_rightColumn ? _rightColumn->width() : 0);