diff --git a/src/mcedit2/worldview/worldview.py b/src/mcedit2/worldview/worldview.py
index 9133691..df5f870 100644
--- a/src/mcedit2/worldview/worldview.py
+++ b/src/mcedit2/worldview/worldview.py
@@ -195,8 +195,8 @@ class WorldView(QGLWidget):
 
     def dealloc(self):
         log.info("Deallocating GL resources for worldview %s", self)
-        self.bufferSwapThread.quit()
         self.waitForSwapThread()
+        self.bufferSwapThread.quit()
         self.makeCurrent()
         self.renderGraph.dealloc()