diff --git a/include/Editor.h b/include/Editor.h
index 4b9017e9eb5..c9386443982 100644
--- a/include/Editor.h
+++ b/include/Editor.h
@@ -47,6 +47,7 @@ class Editor : public QMainWindow
 	DropToolBar * addDropToolBar(Qt::ToolBarArea whereToAdd, QString const & windowTitle);
 	DropToolBar * addDropToolBar(QWidget * parent, Qt::ToolBarArea whereToAdd, QString const & windowTitle);
 
+	virtual void closeEvent( QCloseEvent * _ce );
 protected slots:
 	virtual void play() {}
 	virtual void record() {}
diff --git a/src/gui/editors/Editor.cpp b/src/gui/editors/Editor.cpp
index bdc3e55d4bb..9aa81fabbee 100644
--- a/src/gui/editors/Editor.cpp
+++ b/src/gui/editors/Editor.cpp
@@ -32,6 +32,7 @@
 #include <QAction>
 #include <QMdiArea>
 #include <QShortcut>
+#include <QCloseEvent>
 
 
 void Editor::setPauseIcon(bool displayPauseIcon)
@@ -121,8 +122,18 @@ QAction *Editor::playAction() const
 	return m_playAction;
 }
 
-
-
+void Editor::closeEvent( QCloseEvent * _ce )
+{
+	if( parentWidget() )
+	{
+		parentWidget()->hide();
+	}
+	else
+	{
+		hide();
+	}
+	_ce->ignore();
+ }
 
 DropToolBar::DropToolBar(QWidget* parent) : QToolBar(parent)
 {
@@ -138,3 +149,6 @@ void DropToolBar::dropEvent(QDropEvent* event)
 {
 	dropped(event);
 }
+
+
+