diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index c7efb41c1b..ff09a5a080 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -797,7 +797,9 @@ bool DocumentData::saveToCache() const {
 			|| isAnimation()
 			|| isVoiceMessage()
 			|| (type == WallPaperDocument)
-			|| isTheme());
+			|| isTheme()
+			|| (mimeString() == qstr("image/png")
+				&& _filename.startsWith("image_")));
 }
 
 void DocumentData::automaticLoadSettingsChanged() {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 9aaf144c65..eb86dbd0f2 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -2027,6 +2027,7 @@ void OverlayWidget::displayDocument(
 				initThemePreview();
 			} else {
 				_documentMedia->automaticLoad(fileOrigin(), item);
+				_document->saveFromDataSilent();
 				auto &location = _document->location(true);
 				if (location.accessEnable()) {
 					const auto &path = location.name();