diff --git a/Plugins/org.mitk.gui.qt.ext/src/QmitkOpenCustomMultiWidgetEditorAction.cpp b/Plugins/org.mitk.gui.qt.ext/src/QmitkOpenCustomMultiWidgetEditorAction.cpp
index 906fdcf629..6226b06489 100644
--- a/Plugins/org.mitk.gui.qt.ext/src/QmitkOpenCustomMultiWidgetEditorAction.cpp
+++ b/Plugins/org.mitk.gui.qt.ext/src/QmitkOpenCustomMultiWidgetEditorAction.cpp
@@ -1,67 +1,81 @@
 /*===================================================================
 
 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)
 {
   this->init(window);
 }
 
 QmitkOpenCustomMultiWidgetEditorAction::QmitkOpenCustomMultiWidgetEditorAction(const QIcon & icon, berry::IWorkbenchWindow::Pointer window)
   : QAction(0)
 {
   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
+  // 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);
   }
 
-  berry::IEditorInput::Pointer editorInput(new mitk::DataStorageEditorInput());
-  m_Window->GetActivePage()->OpenEditor(editorInput, "org.mitk.editors.custommultiwidget");
+  ctkPluginContext* context = QmitkCommonExtPlugin::getContext();
+  ctkServiceReference serviceRef = context->getServiceReference<mitk::IDataStorageService>();
+  if (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");
+    }
+  }
 }