diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp
index 549739f85..b65cc9b08 100644
--- a/qrenderdoc/Code/CaptureContext.cpp
+++ b/qrenderdoc/Code/CaptureContext.cpp
@@ -77,7 +77,9 @@ CaptureContext::CaptureContext(QString paramFilename, QString remoteHost, uint32
   {
     QFileInfo fi(paramFilename);
 
-    m_MainWindow->LoadFromFilename(paramFilename);
+    m_MainWindow->LoadFromFilename(paramFilename, temp);
+    if(temp)
+      m_MainWindow->takeLogOwnership();
   }
 }
 
diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp
index 12f96cad3..7d9b75238 100644
--- a/qrenderdoc/Windows/MainWindow.cpp
+++ b/qrenderdoc/Windows/MainWindow.cpp
@@ -264,17 +264,17 @@ void MainWindow::on_action_Open_Log_triggered()
          "*.jpeg *.png *.tga *.gif *.psd;;All Files (*.*)"));
 
   if(!filename.isEmpty())
-    LoadFromFilename(filename);
+    LoadFromFilename(filename, false);
 }
 
-void MainWindow::LoadFromFilename(const QString &filename)
+void MainWindow::LoadFromFilename(const QString &filename, bool temporary)
 {
   QFileInfo path(filename);
   QString ext = path.suffix().toLower();
 
   if(ext == lit("rdc"))
   {
-    LoadLogfile(filename, false, true);
+    LoadLogfile(filename, temporary, true);
   }
   else if(ext == lit("cap"))
   {
@@ -287,7 +287,7 @@ void MainWindow::LoadFromFilename(const QString &filename)
   else
   {
     // not a recognised filetype, see if we can load it anyway
-    LoadLogfile(filename, false, true);
+    LoadLogfile(filename, temporary, true);
   }
 }
 
@@ -1631,7 +1631,7 @@ void MainWindow::dropEvent(QDropEvent *event)
 {
   QString fn = dragFilename(event->mimeData());
   if(!fn.isEmpty())
-    LoadFromFilename(fn);
+    LoadFromFilename(fn, false);
 }
 
 void MainWindow::LoadSaveLayout(QAction *action, bool save)
diff --git a/qrenderdoc/Windows/MainWindow.h b/qrenderdoc/Windows/MainWindow.h
index 31c9dad13..4181ec283 100644
--- a/qrenderdoc/Windows/MainWindow.h
+++ b/qrenderdoc/Windows/MainWindow.h
@@ -68,7 +68,7 @@ public:
 
   void setProgress(float val);
   void takeLogOwnership() { m_OwnTempLog = true; }
-  void LoadFromFilename(const QString &filename);
+  void LoadFromFilename(const QString &filename, bool temporary);
   void LoadLogfile(const QString &filename, bool temporary, bool local);
   void CloseLogfile();
   QString GetSavePath();