Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs
===================================================================
diff -u -r3ee80d5d797653a6eac5c4a46c4900ad4fbe8380 -r5933051dfa1dbc40dbf7552852e6ca85ae7b0811
--- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision 3ee80d5d797653a6eac5c4a46c4900ad4fbe8380)
+++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision 5933051dfa1dbc40dbf7552852e6ca85ae7b0811)
@@ -834,7 +834,7 @@
 
         private void OnActiveViewChanged(object sender, ActiveViewChangeEventArgs e)
         {
-            if (e.View == null || mainWindow == null || mainWindow.IsWindowDisposed)
+            if (mainWindow == null || mainWindow.IsWindowDisposed)
             {
                 return;
             }
Index: Core/Common/test/Core.Common.Test/Core.Common.Test.csproj
===================================================================
diff -u -r00c8bc7fed580b4a9820a7d85b3b6d2346599f65 -r5933051dfa1dbc40dbf7552852e6ca85ae7b0811
--- Core/Common/test/Core.Common.Test/Core.Common.Test.csproj	(.../Core.Common.Test.csproj)	(revision 00c8bc7fed580b4a9820a7d85b3b6d2346599f65)
+++ Core/Common/test/Core.Common.Test/Core.Common.Test.csproj	(.../Core.Common.Test.csproj)	(revision 5933051dfa1dbc40dbf7552852e6ca85ae7b0811)
@@ -60,6 +60,14 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Fluent.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Windows.Shell, Version=3.5.41019.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Microsoft.Windows.Shell.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
       <Private>True</Private>
@@ -76,6 +84,9 @@
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
Index: Core/Common/test/Core.Common.Test/Gui/RingtoetsGuiTests.cs
===================================================================
diff -u -r25019cc752a91361f32968c26d48064ed35a916c -r5933051dfa1dbc40dbf7552852e6ca85ae7b0811
--- Core/Common/test/Core.Common.Test/Gui/RingtoetsGuiTests.cs	(.../RingtoetsGuiTests.cs)	(revision 25019cc752a91361f32968c26d48064ed35a916c)
+++ Core/Common/test/Core.Common.Test/Gui/RingtoetsGuiTests.cs	(.../RingtoetsGuiTests.cs)	(revision 5933051dfa1dbc40dbf7552852e6ca85ae7b0811)
@@ -1,7 +1,10 @@
 using System.Linq;
 
 using Core.Common.Base.Plugin;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
+using Core.Common.Gui.Forms.MainWindow;
+using Core.Common.Test.TestObjects;
 using NUnit.Framework;
 using Rhino.Mocks;
 
@@ -33,7 +36,7 @@
         [Test]
         public void CheckViewPropertyEditorIsInitialized()
         {
-            using (var gui = new RingtoetsGui())
+            using (new RingtoetsGui())
             {
                 Assert.NotNull(ViewPropertyEditor.Gui);
             }
@@ -145,5 +148,34 @@
             }
             mocks.VerifyAll();
         }
+
+        [Test]
+        [RequiresSTA]
+        public void ActiveViewChanged_LastDocumentViewClosed_EventFired()
+        {
+            // Setup
+            using (var gui = new RingtoetsGui())
+            {
+                gui.MainWindow = new MainWindow(gui);
+                gui.Run();
+
+                var view = new TestView();
+
+                // Precondition
+                Assert.AreEqual(0, gui.DocumentViews.Count);
+
+                gui.DocumentViews.Add(view);
+
+                var hitCount = 0;
+                gui.ActiveViewChanged += (s, e) => hitCount++;
+
+                // Call
+                gui.DocumentViews.RemoveAt(0);
+
+                // Assert
+                Assert.AreEqual(0, gui.DocumentViews.Count);
+                Assert.AreEqual(1, hitCount);
+            }
+        }
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.Test/packages.config
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r5933051dfa1dbc40dbf7552852e6ca85ae7b0811
--- Core/Common/test/Core.Common.Test/packages.config	(.../packages.config)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/packages.config	(.../packages.config)	(revision 5933051dfa1dbc40dbf7552852e6ca85ae7b0811)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AvalonDock" version="2.0.2000" targetFramework="net40" />
+  <package id="Fluent.Ribbon" version="3.4.0" targetFramework="net40" />
   <package id="log4net" version="2.0.4" targetFramework="net40" />
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
   <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />