diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 130184e61..88d72ffc0 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -462,8 +462,8 @@ void OverlayWidget::RendererGL::paintRadialLoading(
 
 void OverlayWidget::RendererGL::paintThemePreview(QRect outer) {
 	paintUsingRaster(_themePreviewImage, outer, [&](Painter &&p) {
-		const auto newOuter = QRect(QPoint(), outer.size());
-		_owner->paintThemePreviewContent(p, newOuter, newOuter);
+		p.translate(-outer.topLeft());
+		_owner->paintThemePreviewContent(p, outer, outer);
 	}, kThemePreviewOffset);
 }
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 3e16da733..b77b9b3c1 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -667,7 +667,7 @@ void OverlayWidget::savePosition() {
 		realPosition.moncrc = 0;
 		DEBUG_LOG(("Viewer Pos: Saving maximized position."));
 	} else {
-		auto r = _window->geometry();
+		auto r = _normalGeometry = _window->geometry();
 		realPosition.x = r.x();
 		realPosition.y = r.y();
 		realPosition.w = r.width();