diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 551e02f516..f6f41c4e11 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -906,6 +906,8 @@ bool wxDocManager::Clear(bool force)
     if (!CloseDocuments(force))
         return false;
 
+    m_currentView = NULL;
+
     wxList::compatibility_iterator node = m_templates.GetFirst();
     while (node)
     {