diff --git a/Plugins/org.mitk.gui.qt.ext/src/QmitkOpenCustomMultiWidgetEditorAction.cpp b/Plugins/org.mitk.gui.qt.ext/src/QmitkOpenCustomMultiWidgetEditorAction.cpp
index 6226b06489..a55170a2f6 100644
--- a/Plugins/org.mitk.gui.qt.ext/src/QmitkOpenCustomMultiWidgetEditorAction.cpp
+++ b/Plugins/org.mitk.gui.qt.ext/src/QmitkOpenCustomMultiWidgetEditorAction.cpp
@@ -1,81 +1,82 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "QmitkOpenCustomMultiWidgetEditorAction.h"
 
 #include "mitkCoreObjectFactory.h"
 
 #include <berryIEditorPart.h>
 #include <berryIWorkbenchPage.h>
 #include <berryIPreferencesService.h>
 #include <berryIWorkbench.h>
 #include <berryPlatform.h>
 #include <mitkDataStorageEditorInput.h>
 
 #include "internal/QmitkCommonExtPlugin.h"
 #include <mitkIDataStorageService.h>
+
 class ctkPluginContext;
 
 QmitkOpenCustomMultiWidgetEditorAction::QmitkOpenCustomMultiWidgetEditorAction(berry::IWorkbenchWindow::Pointer window)
-  : QAction(0)
+  : QAction(nullptr)
 {
   this->init(window);
 }
 
-QmitkOpenCustomMultiWidgetEditorAction::QmitkOpenCustomMultiWidgetEditorAction(const QIcon & icon, berry::IWorkbenchWindow::Pointer window)
-  : QAction(0)
+QmitkOpenCustomMultiWidgetEditorAction::QmitkOpenCustomMultiWidgetEditorAction(const QIcon& icon, berry::IWorkbenchWindow::Pointer window)
+  : QAction(nullptr)
 {
   this->setIcon(icon);
 
   this->init(window);
 }
 
 void QmitkOpenCustomMultiWidgetEditorAction::init(berry::IWorkbenchWindow::Pointer window)
 {
   m_Window = window;
   this->setParent(static_cast<QWidget*>(m_Window->GetShell()->GetControl()));
   this->setText("&CUSTOMEDITOR");
   this->setToolTip("Open the custom multi widget editor");
 
   berry::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
 
   m_GeneralPreferencesNode = prefService->GetSystemPreferences()->Node("/General");
 
   this->connect(this, SIGNAL(triggered(bool)), this, SLOT(Run()));
 }
 
 void QmitkOpenCustomMultiWidgetEditorAction::Run()
 {
   // check if there is an open perspective, if not open the default perspective
   if (m_Window->GetActivePage().IsNull())
   {
     QString defaultPerspId = m_Window->GetWorkbench()->GetPerspectiveRegistry()->GetDefaultPerspective();
     m_Window->GetWorkbench()->ShowPerspective(defaultPerspId, m_Window);
   }
 
   ctkPluginContext* context = QmitkCommonExtPlugin::getContext();
   ctkServiceReference serviceRef = context->getServiceReference<mitk::IDataStorageService>();
   if (serviceRef)
   {
-    mitk::IDataStorageService *dsService = context->getService<mitk::IDataStorageService>(serviceRef);
+    mitk::IDataStorageService* dsService = context->getService<mitk::IDataStorageService>(serviceRef);
     if (dsService)
     {
       mitk::IDataStorageReference::Pointer dsRef = dsService->GetDataStorage();
       berry::IEditorInput::Pointer editorInput(new mitk::DataStorageEditorInput(dsRef));
-      m_Window->GetActivePage()->OpenEditor(editorInput, "org.mitk.editors.custommultiwidget");
+      m_Window->GetActivePage()->OpenEditor(editorInput, "org.mitk.editors.custommultiwidget", true, berry::IWorkbenchPage::MATCH_ID);
     }
   }
 }
diff --git a/Plugins/org.mitk.gui.qt.renderwindowmanager/src/internal/QmitkRenderWindowManagerView.cpp b/Plugins/org.mitk.gui.qt.renderwindowmanager/src/internal/QmitkRenderWindowManagerView.cpp
index 42ee4ebd91..2d85db42d5 100644
--- a/Plugins/org.mitk.gui.qt.renderwindowmanager/src/internal/QmitkRenderWindowManagerView.cpp
+++ b/Plugins/org.mitk.gui.qt.renderwindowmanager/src/internal/QmitkRenderWindowManagerView.cpp
@@ -1,135 +1,140 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 // render window manager plugin
 #include "QmitkRenderWindowManagerView.h"
 
 // blueberry
 #include <berryISelectionService.h>
 #include <berryIWorkbenchWindow.h>
 
 // mitk core
 #include <mitkBaseRenderer.h>
 #include <mitkDataNode.h>
 
 const std::string QmitkRenderWindowManagerView::VIEW_ID = "org.mitk.views.renderwindowmanager";
 
 void QmitkRenderWindowManagerView::RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart)
 {
   if (m_RenderWindowPart != renderWindowPart)
   {
     m_RenderWindowPart = renderWindowPart;
   }
 
   SetControlledRenderer();
 }
 
 void QmitkRenderWindowManagerView::RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderWindowPart)
 {
-  m_RenderWindowPart = nullptr;
+  if (m_RenderWindowPart == renderWindowPart)
+  {
+    m_RenderWindowPart = nullptr;
+  }
+
+  SetControlledRenderer();
 }
 
 void QmitkRenderWindowManagerView::RenderWindowPartInputChanged(mitk::IRenderWindowPart* renderWindowPart)
 {
   if (m_RenderWindowPart == renderWindowPart)
   {
     SetControlledRenderer();
   }
 }
 
 void QmitkRenderWindowManagerView::SetFocus()
 {
   // nothing here
 }
 
 void QmitkRenderWindowManagerView::CreateQtPartControl(QWidget* parent)
 {
   // create GUI widgets
   m_Controls.setupUi(parent);
   // add custom render window manager UI widget to the 'renderWindowManagerTab'
   m_RenderWindowManipulatorWidget = new QmitkRenderWindowManipulatorWidget(GetDataStorage(), parent);
   m_RenderWindowManipulatorWidget->setObjectName(QStringLiteral("m_RenderWindowManipulatorWidget"));
   m_Controls.verticalLayout->addWidget(m_RenderWindowManipulatorWidget);
 
   SetControlledRenderer();
 
   connect(m_Controls.comboBoxRenderWindowSelection, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(OnRenderWindowSelectionChanged(const QString&)));
   connect(m_RenderWindowManipulatorWidget, SIGNAL(AddLayerButtonClicked()), this, SLOT(OnAddLayerButtonClicked()));
 }
 
 void QmitkRenderWindowManagerView::SetControlledRenderer()
 {
   m_Controls.comboBoxRenderWindowSelection->clear();
 
   const mitk::RenderingManager::RenderWindowVector allRegisteredRenderWindows = mitk::RenderingManager::GetInstance()->GetAllRegisteredRenderWindows();
   mitk::BaseRenderer* baseRenderer = nullptr;
   for (const auto &renderWindow : allRegisteredRenderWindows)
   {
     baseRenderer = mitk::BaseRenderer::GetInstance(renderWindow);
     if (nullptr != baseRenderer)
     {
       m_ControlledRenderer.push_back(baseRenderer);
       m_Controls.comboBoxRenderWindowSelection->addItem(baseRenderer->GetName());
     }
   }
 
   m_RenderWindowManipulatorWidget->SetControlledRenderer(m_ControlledRenderer);
 
   OnRenderWindowSelectionChanged(m_Controls.comboBoxRenderWindowSelection->itemText(0));
 }
 
 void QmitkRenderWindowManagerView::OnRenderWindowSelectionChanged(const QString &renderWindowId)
 {
   m_RenderWindowManipulatorWidget->SetActiveRenderWindow(renderWindowId);
 }
 
 void QmitkRenderWindowManagerView::OnAddLayerButtonClicked()
 {
   QList<mitk::DataNode::Pointer> nodes = GetDataManagerSelection();
   for (mitk::DataNode* dataNode : nodes)
   {
     if (nullptr != dataNode)
     {
       m_RenderWindowManipulatorWidget->AddLayer(dataNode);
 
       // get child nodes of the current node
       mitk::DataStorage::SetOfObjects::ConstPointer derivedNodes = GetDataStorage()->GetDerivations(dataNode, nullptr, false);
       for (mitk::DataStorage::SetOfObjects::ConstIterator it = derivedNodes->Begin(); it != derivedNodes->End(); ++it)
       {
         m_RenderWindowManipulatorWidget->AddLayer(it->Value());
       }
     }
   }
 }
 
 void QmitkRenderWindowManagerView::NodeAdded(const mitk::DataNode* node)
 {
   bool global = false;
   node->GetBoolProperty("globalObject_RWM", global);
   if (global)
   {
     // initially insert new point set node into the node list of all render windows
     // the node object of a new point set won't be visible due to its "helper object" property set to true
     m_RenderWindowManipulatorWidget->AddLayerToAllRenderer(const_cast<mitk::DataNode*>(node));
   }
   else
   {
     // initially set new node as invisible in all render windows
     // this way, each single renderer overwrites the common renderer and the node is invisible
     // until it is inserted into the node list of a render windows
     m_RenderWindowManipulatorWidget->HideDataNodeInAllRenderer(node);
   }
 }