diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index f886a2ac..6ba89dc1 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -958,15 +958,7 @@ void MainWindow::setActiveViewModeAction(QAction* action)
         d->mCurrentMainPageId = BrowseMainPageId;
         // Switching to browse mode
         d->mViewStackedWidget->setCurrentWidget(d->mBrowseMainPage);
-        if (!d->mViewMainPage->isEmpty()
-                && KProtocolManager::supportsListing(d->mViewMainPage->url())) {
-            // Reset the view to spare resources, but don't do it if we can't
-            // browse the url, otherwise if the user starts Gwenview this way:
-            // gwenview http://example.com/example.png
-            // and switch to browse mode, switching back to view mode won't bring
-            // his image back.
-            d->mViewMainPage->reset();
-        }
+        d->mViewMainPage->reset();
         setCaption(QString());
     }
     d->autoAssignThumbnailProvider();
@@ -1024,7 +1016,6 @@ void MainWindow::openSelectedDocuments()
         // Selection contains no fitting items
         // Switch back to browsing mode
         d->mBrowseAction->trigger();
-        d->mViewMainPage->reset();
         return;
     }
 
@@ -1063,6 +1054,8 @@ void MainWindow::showStartMainPage()
     d->mContextManager->setCurrentDirUrl(QUrl());
     d->mContextManager->setCurrentUrl(QUrl());
 
+    d->mViewMainPage->reset();
+
     d->autoAssignThumbnailProvider();
 }
 
@@ -1108,7 +1101,6 @@ void MainWindow::openDirUrl(const QUrl &url)
     d->mThumbnailProvider->stop();
     d->mContextManager->setCurrentDirUrl(url);
     d->mGvCore->addUrlToRecentFolders(url);
-    d->mViewMainPage->reset();
 }
 
 void MainWindow::folderViewUrlChanged(const QUrl &url) {
diff --git a/app/viewmainpage.cpp b/app/viewmainpage.cpp
index f6ccd695..6987a634 100644
--- a/app/viewmainpage.cpp
+++ b/app/viewmainpage.cpp
@@ -755,9 +755,12 @@ void ViewMainPage::reload()
 
 void ViewMainPage::reset()
 {
-    d->mDocumentViewController->reset();
-    d->mDocumentViewContainer->reset();
-    d->mDocumentViews.clear();
+    // Reset the view to spare resources
+    if (!isEmpty()) {
+        d->mDocumentViewController->reset();
+        d->mDocumentViewContainer->reset();
+        d->mDocumentViews.clear();
+    }
 }
 
 void ViewMainPage::slotViewFocused(DocumentView* view)