diff --git a/src/mcedit2/editorsession.py b/src/mcedit2/editorsession.py
index 1c8d11f..b1e1ff8 100644
--- a/src/mcedit2/editorsession.py
+++ b/src/mcedit2/editorsession.py
@@ -824,12 +824,13 @@ class EditorSession(QtCore.QObject):
             if ret == QtGui.QMessageBox.Cancel:
                 return False
 
+        for panel in self.panels:
+            panel.close()
+
         self.editorTab.saveState()
         self.worldEditor.close()
         self.worldEditor = None
 
-        for panel in self.panels:
-            panel.close()
         return True
 
     # --- Inspector ---