diff --git a/lib/contextmanager.cpp b/lib/contextmanager.cpp
--- a/lib/contextmanager.cpp
+++ b/lib/contextmanager.cpp
@@ -177,6 +177,10 @@
 void ContextManager::setCurrentDirUrl(const QUrl &url)
 {
     if (url == d->mCurrentDirUrl) {
+        // In case we are waiting for a new file for selectUrlToSelect(),
+        // force update to make sure we get a dirLister completed() signal.
+        d->mDirModel->dirLister()->updateDirectory(url);
+        d->mDirListerFinished = false;
         return;
     }
 
diff --git a/lib/document/document.cpp b/lib/document/document.cpp
--- a/lib/document/document.cpp
+++ b/lib/document/document.cpp
@@ -322,6 +322,7 @@
         d->mUrl = saveJob->newUrl();
         d->mImageMetaInfoModel.setUrl(d->mUrl);
         saved(saveJob->oldUrl(), d->mUrl);
+        reload();
     }
 }