diff --git a/apps/opencs/model/doc/documentmanager.cpp b/apps/opencs/model/doc/documentmanager.cpp
index 7a1a86153..2d444f245 100644
--- a/apps/opencs/model/doc/documentmanager.cpp
+++ b/apps/opencs/model/doc/documentmanager.cpp
@@ -69,7 +69,7 @@ void CSMDoc::DocumentManager::removeDocument (CSMDoc::Document *document)
         throw std::runtime_error ("removing invalid document");
 
     mDocuments.erase (iter);
-    delete document;
+    document->deleteLater();
 
     if (mDocuments.empty())
         emit lastDocumentDeleted();
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index aaf8f2d6a..e430bfa5e 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -32,10 +32,6 @@ void CSVDoc::View::closeEvent (QCloseEvent *event)
         event->ignore();
     else
     {
-        // delete the subviews first
-        for (QList<CSVDoc::SubView *>::iterator iter = mSubViews.begin(); iter != mSubViews.end(); ++iter)
-            delete *iter;
-
         // closeRequest() returns true if last document
         mViewManager.removeDocAndView(mDocument);
     }
@@ -98,7 +94,7 @@ void CSVDoc::View::setupEditMenu()
 
     QAction *search = new QAction (tr ("Search"), this);
     connect (search, SIGNAL (triggered()), this, SLOT (addSearchSubView()));
-    edit->addAction (search);    
+    edit->addAction (search);
 }
 
 void CSVDoc::View::setupViewMenu()