diff --git a/src/mcedit2/panels/player.py b/src/mcedit2/panels/player.py
index caab341..5a7cff0 100644
--- a/src/mcedit2/panels/player.py
+++ b/src/mcedit2/panels/player.py
@@ -93,7 +93,7 @@ class PlayerPanel(QtGui.QWidget):
         action.setCheckable(True)
         action.triggered.connect(self.toggleView)
         self._toggleViewAction = action
-
+                     
         self.editorSession.revisionChanged.connect(self.revisionDidChange)
         self.initPropertiesWidget()
 
@@ -172,6 +172,10 @@ class PlayerPanel(QtGui.QWidget):
         else:
             self.hide()
             self._toggleViewAction.setChecked(False)
+            
+    def closeEvent(self, event):
+        self.toggleView()
+        event.accept()
 
     def toggleViewAction(self):
         return self._toggleViewAction