diff --git a/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cpp b/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cpp
index d71ae26799..ecbe3d7f4b 100755
--- a/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cpp
+++ b/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cpp
@@ -1,138 +1,136 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "QmitkPointSetInteractionView.h"
 
 #include <berryIWorkbenchWindow.h>
 #include <berryISelectionService.h>
 #include <QInputDialog>
 #include <QLineEdit>
 
 #include <mitkDataNodeObject.h>
 #include <mitkDataNodeSelection.h>
-#include <mitkProperties.h>
+#include <mitkNodePredicateDataType.h>
+#include <mitkNodePredicateAnd.h>
+#include <mitkNodePredicateNot.h>
+#include <mitkNodePredicateProperty.h>
 
 #include <QmitkPointListWidget.h>
 #include <QmitkRenderWindow.h>
 
 const std::string QmitkPointSetInteractionView::VIEW_ID = "org.mitk.views.pointsetinteraction";
 
 QmitkPointSetInteractionView::QmitkPointSetInteractionView()
   : m_Controls(nullptr)
 {
 }
 
 QmitkPointSetInteractionView::~QmitkPointSetInteractionView()
 {
 }
 
 void QmitkPointSetInteractionView::CreateQtPartControl(QWidget *parent)
 {
   m_Controls = new Ui::QmitkPointSetInteractionViewControls;
   m_Controls->setupUi(parent);
 
+  m_Controls->selectedPointSetWidget->SetDataStorage(GetDataStorage());
+  m_Controls->selectedPointSetWidget->SetNodePredicate(mitk::NodePredicateAnd::New(
+    mitk::TNodePredicateDataType<mitk::PointSet>::New(),
+    mitk::NodePredicateNot::New(mitk::NodePredicateProperty::New("helper object"))));
+
+  m_Controls->selectedPointSetWidget->SetSelectionIsOptional(true);
+  m_Controls->selectedPointSetWidget->SetEmptyInfo(QString("Please select a point set"));
+  m_Controls->selectedPointSetWidget->SetPopUpTitel(QString("Select point set"));
+
+  m_SelectionServiceConnector = std::make_unique<QmitkSelectionServiceConnector>();
+
+  m_SelectionServiceConnector->AddPostSelectionListener(GetSite()->GetWorkbenchWindow()->GetSelectionService());
+  connect(m_SelectionServiceConnector.get(), &QmitkSelectionServiceConnector::ServiceSelectionChanged,
+    m_Controls->selectedPointSetWidget, &QmitkSingleNodeSelectionWidget::SetCurrentSelection);
+
+  connect(m_Controls->selectedPointSetWidget, &QmitkSingleNodeSelectionWidget::CurrentSelectionChanged,
+    this, &QmitkPointSetInteractionView::OnCurrentSelectionChanged);
+
   connect(m_Controls->addPointSetPushButton, &QPushButton::clicked,
     this, &QmitkPointSetInteractionView::OnAddPointSetClicked);
 
   if (mitk::IRenderWindowPart* renderWindowPart = GetRenderWindowPart())
   {
     RenderWindowPartActivated(renderWindowPart);
   }
 }
 
 void QmitkPointSetInteractionView::SetFocus()
 {
   m_Controls->addPointSetPushButton->setFocus();
 }
 
-void QmitkPointSetInteractionView::OnSelectionChanged(berry::IWorkbenchPart::Pointer, const QList<mitk::DataNode::Pointer>& nodes)
+void QmitkPointSetInteractionView::OnCurrentSelectionChanged(QList<mitk::DataNode::Pointer> nodes)
 {
-  mitk::DataNode::Pointer selectedNode;
-
-  if (!nodes.empty())
-  {
-    selectedNode = nodes.front();
-  }
-
-  mitk::PointSet::Pointer pointSet;
-
-  if (selectedNode.IsNotNull())
+  if (nodes.empty() || nodes.front().IsNull())
   {
-    pointSet = dynamic_cast<mitk::PointSet*>(selectedNode->GetData());
+    m_Controls->poinSetListWidget->SetPointSetNode(nullptr);
+    return;
   }
 
-  if (pointSet.IsNotNull())
+  auto selectedPointSet = dynamic_cast<mitk::PointSet*>(nodes.front()->GetData());
+  if (nullptr == selectedPointSet)
   {
-    m_SelectedPointSetNode = selectedNode;
-    m_Controls->currentPointSetLabel->setText(QString::fromStdString(selectedNode->GetName()));
-    m_Controls->poinSetListWidget->SetPointSetNode(selectedNode);
-  }
-  else
-  {
-    m_Controls->currentPointSetLabel->setText(tr("None"));
     m_Controls->poinSetListWidget->SetPointSetNode(nullptr);
+    return;
   }
-}
 
-void QmitkPointSetInteractionView::NodeChanged(const mitk::DataNode* node)
-{
-  if (node == m_SelectedPointSetNode && m_Controls->currentPointSetLabel->text().toStdString() != node->GetName())
-  {
-    m_Controls->currentPointSetLabel->setText(QString::fromStdString(node->GetName()));
-  }
+  m_Controls->poinSetListWidget->SetPointSetNode(nodes.front());
 }
 
 void QmitkPointSetInteractionView::RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart)
 {
   if (nullptr != m_Controls)
   {
     m_Controls->poinSetListWidget->AddSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("axial")->GetSliceNavigationController());
     m_Controls->poinSetListWidget->AddSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController());
     m_Controls->poinSetListWidget->AddSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("coronal")->GetSliceNavigationController());
   }
 }
 
 void QmitkPointSetInteractionView::RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderWindowPart)
 {
   if (nullptr != m_Controls)
   {
     m_Controls->poinSetListWidget->RemoveSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("axial")->GetSliceNavigationController());
     m_Controls->poinSetListWidget->RemoveSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController());
     m_Controls->poinSetListWidget->RemoveSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("coronal")->GetSliceNavigationController());
   }
 }
 
 void QmitkPointSetInteractionView::OnAddPointSetClicked()
 {
   // ask for the name of the point set
   bool ok = false;
   QString name = QInputDialog::getText(QApplication::activeWindow(),
     tr("Add point set..."), tr("Enter name for the new point set"), QLineEdit::Normal, tr("PointSet"), &ok);
   if (!ok || name.isEmpty())
   {
     return;
   }
 
   mitk::PointSet::Pointer pointSet = mitk::PointSet::New();
   mitk::DataNode::Pointer pointSetNode = mitk::DataNode::New();
   pointSetNode->SetData(pointSet);
   pointSetNode->SetProperty("name", mitk::StringProperty::New(name.toStdString()));
   pointSetNode->SetProperty("opacity", mitk::FloatProperty::New(1));
   pointSetNode->SetColor(1.0, 1.0, 0.0);
   this->GetDataStorage()->Add(pointSetNode);
 
-  // create a new selection and emulate selection for this
-  berry::IWorkbenchPart::Pointer nullPart;
-  QList<mitk::DataNode::Pointer> selection;
-  selection.push_back(pointSetNode);
-  this->OnSelectionChanged(nullPart, selection);
+  m_Controls->selectedPointSetWidget->SetCurrentSelectedNode(pointSetNode);
 }
diff --git a/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.h b/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.h
index f19f838937..802555cab1 100755
--- a/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.h
+++ b/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.h
@@ -1,69 +1,64 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #ifndef QMITKPOINTSETINTERACTIONVIEW_H
 #define QMITKPOINTSETINTERACTIONVIEW_H
 
 #include "ui_QmitkPointSetInteractionViewControls.h"
 
 // mitk core
 #include <mitkDataNode.h>
-#include <mitkWeakPointer.h>
 
 // org mitk gui common plugin
-#include <mitkILifecycleAwarePart.h>
 #include <mitkIRenderWindowPartListener.h>
 
 // org mitk gui qt common plugin
 #include <QmitkAbstractView.h>
-
-#include <berryISelectionListener.h>
+#include <QmitkSelectionServiceConnector.h>
 
 /**
 * @brief
 *
 *
 */
 class QmitkPointSetInteractionView : public QmitkAbstractView, public mitk::IRenderWindowPartListener
 {
   Q_OBJECT
 
 public:
 
   static const std::string VIEW_ID;
 
   QmitkPointSetInteractionView();
   ~QmitkPointSetInteractionView() override;
 
   void SetFocus() override;
 
-  void OnSelectionChanged(berry::IWorkbenchPart::Pointer part, const QList<mitk::DataNode::Pointer>& nodes) override;
-  void NodeChanged(const mitk::DataNode* node) override;
-
   void RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart) override;
   void RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderWindowPart) override;
 
-protected Q_SLOT:
+private Q_SLOT:
 
+  void OnCurrentSelectionChanged(QList<mitk::DataNode::Pointer> nodes);
   void OnAddPointSetClicked();
 
 private:
 
   void CreateQtPartControl(QWidget *parent) override;
 
   Ui::QmitkPointSetInteractionViewControls* m_Controls;
 
-  mitk::WeakPointer<mitk::DataNode> m_SelectedPointSetNode;
+  std::unique_ptr<QmitkSelectionServiceConnector> m_SelectionServiceConnector;
 
 };
 
 #endif // QMITKPOINTSETINTERACTIONVIEW_H
diff --git a/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionViewControls.ui b/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionViewControls.ui
index 68ee724c07..e25b3ed02b 100755
--- a/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionViewControls.ui
@@ -1,77 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkPointSetInteractionViewControls</class>
  <widget class="QWidget" name="QmitkPointSetInteractionViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>300</width>
     <height>600</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>PointSet Interaction</string>
   </property>
   <layout class="QVBoxLayout">
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
-      <widget class="QLabel" name="pointSetLabel">
+      <widget class="QLabel" name="selectedPointSetLabel">
        <property name="text">
-        <string>Selected point set:</string>
+        <string>Selected point set</string>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QLabel" name="currentPointSetLabel">
-       <property name="text">
-        <string>none</string>
+      <widget class="QmitkSingleNodeSelectionWidget" name="selectedPointSetWidget" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>40</height>
+        </size>
        </property>
       </widget>
      </item>
      <item row="1" column="0" colspan="2">
       <widget class="QPushButton" name="addPointSetPushButton">
        <property name="text">
         <string>Add new point set</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
       <string>Current pointset</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <widget class="QmitkPointListWidget" name="poinSetListWidget" native="true"/>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QmitkSingleNodeSelectionWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">QmitkSingleNodeSelectionWidget.h</header>
+  </customwidget>
   <customwidget>
    <class>QmitkPointListWidget</class>
    <extends>QWidget</extends>
    <header location="global">QmitkPointListWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>