diff --git a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
index ee78479b8..a6ab84609 100644
--- a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
+++ b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
@@ -467,6 +467,9 @@ void PythonContext::Finish()
 
 void PythonContext::GlobalShutdown()
 {
+  if(!initialised())
+    return;
+
   // must happen on the UI thread
   if(qApp->thread() != QThread::currentThread())
   {
diff --git a/qrenderdoc/Code/qrenderdoc.cpp b/qrenderdoc/Code/qrenderdoc.cpp
index 2019c904a..49b184e45 100644
--- a/qrenderdoc/Code/qrenderdoc.cpp
+++ b/qrenderdoc/Code/qrenderdoc.cpp
@@ -365,10 +365,10 @@ int main(int argc, char *argv[])
       }
 
       config.Save();
-
-      PythonContext::GlobalShutdown();
     }
 
+    PythonContext::GlobalShutdown();
+
     Formatter::shutdown();
   }