diff --git a/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp b/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp
index 6155aed346..514950512b 100644
--- a/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimDockWindowController.cpp
@@ -216,6 +216,7 @@ void RimDockWindowController::setAsActiveViewer()
         else if ( auto plotView = dynamic_cast<RimPlotWindow*>( pdmView ) )
         {
             RiuPlotMainWindowTools::selectAsCurrentItem( plotView );
+            RiuPlotMainWindowTools::refreshToolbars();
         }
     }
 }
diff --git a/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp b/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp
index b04b56c179..ebaaafab62 100644
--- a/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp
@@ -263,6 +263,7 @@ void RimViewWindow::fieldChangedByUi( const caf::PdmFieldHandle* changedField, c
         if ( isWindowVisible() )
         {
             onLoadDataAndUpdate();
+            setAsActiveViewer();
         }
         else
         {
@@ -280,14 +281,8 @@ void RimViewWindow::updateWindowTitle()
     if ( viewWidget() && dockWidget() )
     {
         viewWidget()->setWindowTitle( windowTitle() );
-        if ( dockWidget()->isFloating() && isActive() )
-        {
-            dockWidget()->setWindowTitle( "* " + windowTitle() );
-        }
-        else
-        {
-            dockWidget()->setWindowTitle( windowTitle() );
-        }
+        dockWidget()->setWindowTitle( windowTitle() );
+
         if ( isActive() )
         {
             dockWidget()->setIcon( QIcon( ":/ActiveWindow.svg" ) );