diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
index 995f291ca..2ce260bc3 100644
--- a/src/Gui/Application.cpp
+++ b/src/Gui/Application.cpp
@@ -860,8 +860,13 @@ void Application::tryClose(QCloseEvent * e)
         // ask all documents if closable
         std::map<const App::Document*, Gui::Document*>::iterator It;
         for (It = d->documents.begin();It!=d->documents.end();It++) {
+            // a document may have several views attached, so ask it directly
+#if 0
             MDIView* active = It->second->getActiveView();
             e->setAccepted(active->canClose());
+#else
+            e->setAccepted(It->second->canClose());
+#endif
             if (!e->isAccepted())
                 return;
         }
diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp
index 87868271f..81c0a7d0d 100644
--- a/src/Gui/Document.cpp
+++ b/src/Gui/Document.cpp
@@ -826,6 +826,7 @@ void Document::createView(const char* sType)
         .arg(QString::fromUtf8(name)).arg(d->_iWinCount++);
 
     view3D->setWindowTitle(title);
+    view3D->setWindowModified(this->isModified());
     view3D->setWindowIcon(QApplication::windowIcon());
     view3D->resize(400, 300);
     getMainWindow()->addWindow(view3D);