diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -967,7 +967,8 @@
             // his image back.
             d->mViewMainPage->reset();
         }
-        setCaption(QString());
+        const QUrl url = d->mContextManager->currentDirUrl();        
+        setCaption(url.path());
     }
     d->autoAssignThumbnailProvider();
     toggleSideBar(d->sideBarVisibility()); 
@@ -1064,6 +1065,7 @@
     d->mContextManager->setCurrentUrl(QUrl());
 
     d->autoAssignThumbnailProvider();
+    setCaption(QString());
 }
 
 void MainWindow::slotStartMainPageUrlSelected(const QUrl &url)
@@ -1109,6 +1111,7 @@
     d->mContextManager->setCurrentDirUrl(url);
     d->mGvCore->addUrlToRecentFolders(url);
     d->mViewMainPage->reset();
+    setCaption(url.path());
 }
 
 void MainWindow::folderViewUrlChanged(const QUrl &url) {
diff --git a/lib/documentview/documentview.cpp b/lib/documentview/documentview.cpp
--- a/lib/documentview/documentview.cpp
+++ b/lib/documentview/documentview.cpp
@@ -822,6 +822,7 @@
 
 void DocumentView::emitFocused()
 {
+    d->updateCaption();
     focused(this);
 }