diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp
index 53506a61e..2e53cca06 100644
--- a/qrenderdoc/Code/CaptureContext.cpp
+++ b/qrenderdoc/Code/CaptureContext.cpp
@@ -103,8 +103,14 @@ QString CaptureContext::TempLogFilename(QString appname)
   QDir dir(folder);
 
   if(folder == "" || !dir.exists())
+  {
     dir = QDir(QDir::tempPath());
 
+    dir.mkdir("RenderDoc");
+
+    dir = QDir(dir.absoluteFilePath("RenderDoc"));
+  }
+
   return dir.absoluteFilePath(
       appname + "_" + QDateTime::currentDateTimeUtc().toString("yyyy.MM.dd_HH.mm.ss") + ".rdc");
 }
diff --git a/renderdocui/Code/Core.cs b/renderdocui/Code/Core.cs
index 493435a92..87537e33a 100644
--- a/renderdocui/Code/Core.cs
+++ b/renderdocui/Code/Core.cs
@@ -700,7 +700,7 @@ namespace renderdocui.Code
             try
             {
                 if (folder.Length == 0 || !Directory.Exists(folder))
-                    folder = Path.GetTempPath();
+                    folder = Path.Combine(Path.GetTempPath(), "RenderDoc");
             }
             catch (ArgumentException)
             {