diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index e2df365a29..98b67142a5 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -58,5 +58,7 @@ int CS::Editor::run()
 {
     mStartup.show();
 
+    QApplication::setQuitOnLastWindowClosed (true);
+
     return QApplication::exec();
-}
\ No newline at end of file
+}
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 0a8759fa1f..78eba78801 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -7,6 +7,7 @@
 #include <QMenuBar>
 #include <QMdiArea>
 #include <QDockWidget>
+#include <QtGui/QApplication>
 
 #include "../../model/doc/document.hpp"
 
@@ -40,10 +41,15 @@ void CSVDoc::View::setupFileMenu()
     connect (mSave, SIGNAL (triggered()), this, SLOT (save()));
     file->addAction (mSave);
 
+    QAction *close = new QAction (tr ("&Close"), this);
+    connect (close, SIGNAL (triggered()), this, SLOT (close()));
+    file->addAction(close);
+
     QAction *exit = new QAction (tr ("&Exit"), this);
-    connect (exit, SIGNAL (triggered()), this, SLOT (close()));
+    connect (exit, SIGNAL (triggered()), QApplication::instance(), SLOT (closeAllWindows()));
     file->addAction(exit);
 
+
 }
 
 void CSVDoc::View::setupEditMenu()