diff --git a/lib/documentview/documentview.cpp b/lib/documentview/documentview.cpp
--- a/lib/documentview/documentview.cpp
+++ b/lib/documentview/documentview.cpp
@@ -410,6 +410,9 @@
     d->mSetup = setup;
     d->mDocument = DocumentFactory::instance()->load(url);
     connect(d->mDocument.data(), SIGNAL(busyChanged(QUrl,bool)), SLOT(slotBusyChanged(QUrl,bool)));
+    connect(d->mDocument.data(), &Document::modified, this, [this]() {
+        d->updateZoomSnapValues();
+    });
 
     if (d->mDocument->loadingState() < Document::KindDetermined) {
         MessageViewAdapter* messageViewAdapter = qobject_cast<MessageViewAdapter*>(d->mAdapter.data());
diff --git a/lib/documentview/rasterimageview.cpp b/lib/documentview/rasterimageview.cpp
--- a/lib/documentview/rasterimageview.cpp
+++ b/lib/documentview/rasterimageview.cpp
@@ -316,6 +316,8 @@
         setZoom(computeZoomToFit());
     } else if (zoomToFill()) {
         setZoom(computeZoomToFill());
+    } else {
+        applyPendingScrollPos();
     }
 
     d->setScalerRegionToVisibleRect();