diff --git a/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp b/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp
index 4e9c4966b5..16cc888652 100644
--- a/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp
@@ -51,6 +51,7 @@ RimDockWindowController::RimDockWindowController()
 //--------------------------------------------------------------------------------------------------
 RimDockWindowController::~RimDockWindowController()
 {
+    m_viewToControl = nullptr;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -148,6 +149,7 @@ void RimDockWindowController::updateViewerWidget()
         {
             viewPdmObject()->deleteViewWidget();
             mainWindow->onViewerRemoved();
+            setViewToControl( nullptr );
         }
     }
 }
diff --git a/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp b/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp
index facc1e5e99..d51ba94e68 100644
--- a/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp
@@ -381,8 +381,8 @@ void RimViewWindow::dockInWindow( int mainWindowID )
     if ( m_windowController == nullptr )
     {
         m_windowController = new RimDockWindowController();
-        m_windowController->setViewToControl( this );
     }
+    m_windowController->setViewToControl( this );
     m_windowController->setMainWindowId( mainWindowID );
 }