diff --git a/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp b/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp
index 955d8b58ae..cd2efece8b 100644
--- a/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp
@@ -1909,6 +1909,7 @@ void Rim3dView::dockInMainWindow()
     removeWindowFromDock();
     dockAs3DViewWindow();
     updateDockWindowVisibility();
+    setAsActiveViewer();
     scheduleCreateDisplayModelAndRedraw();
 }
 
@@ -1920,5 +1921,6 @@ void Rim3dView::dockInPlotWindow()
     removeWindowFromDock();
     dockAsPlotWindow();
     updateDockWindowVisibility();
+    setAsActiveViewer();
     scheduleCreateDisplayModelAndRedraw();
 }
diff --git a/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp b/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp
index 4b56f56509..b2a2fa3781 100644
--- a/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp
@@ -182,8 +182,6 @@ void RimDockWindowController::setAsActiveViewer()
 
     if ( auto pdmView = viewPdmObject() )
     {
-        if ( pdmView->isActive() ) return;
-
         for ( auto viewWin : getMainWindow()->viewWindows() )
         {
             if ( viewWin->isActive() )