3 files changed, 8 insertions, 2 deletions

diff --git a/src/gempub.c b/src/gempub.c
index 0f0345dc..aa03d835 100644
--- a/src/gempub.c
+++ b/src/gempub.c
@@ -206,13 +206,17 @@ void close_Gempub(iGempub *d) {
 }
 
 void setBaseUrl_Gempub(iGempub *d, const iString *url) {
-    set_String(&d->baseUrl, url);
+    set_String(&d->baseUrl, collect_String(urlDecodeExclude_String(url, "/:")));
 }
 
 iBool isOpen_Gempub(const iGempub *d) {
     return d->arch != NULL;
 }
 
+const iString *coverPageUrl_Gempub(const iGempub *d) {
+    return &d->baseUrl;
+}
+
 const iString *indexPageUrl_Gempub(const iGempub *d) {
     iAssert(!isEmpty_String(&d->baseUrl));
     iString *dir = collect_String(copy_String(&d->baseUrl));
diff --git a/src/gempub.h b/src/gempub.h
index fb3c510b..6912bcc9 100644
--- a/src/gempub.h
+++ b/src/gempub.h
@@ -57,6 +57,7 @@ iString *   coverPageSource_Gempub  (const iGempub *);
 iBool       preloadCoverImage_Gempub(const iGempub *, iGmDocument *doc);
 
 const iString * property_Gempub         (const iGempub *, enum iGempubProperty);
+const iString * coverPageUrl_Gempub     (const iGempub *);
 const iString * indexPageUrl_Gempub     (const iGempub *);
 const iString * navStartLinkUrl_Gempub  (const iGempub *); /* for convenience */
 
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 5a5a4f84..5d449851 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1137,7 +1137,8 @@ static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d) {
         }
     }
     if (d->sourceGempub) {
-        if (preloadCoverImage_Gempub(d->sourceGempub, d->doc)) {
+        if (equal_String(d->mod.url, coverPageUrl_Gempub(d->sourceGempub)) &&
+            preloadCoverImage_Gempub(d->sourceGempub, d->doc)) {
             redoLayout_GmDocument(d->doc);
             updateVisible_DocumentWidget_(d);
             invalidate_DocumentWidget_(d);