diff --git a/Modules/QtWidgets/src/QmitkDataStorageComboBoxWithSelectNone.cpp b/Modules/QtWidgets/src/QmitkDataStorageComboBoxWithSelectNone.cpp
index 1f18d2ef98..a512495502 100644
--- a/Modules/QtWidgets/src/QmitkDataStorageComboBoxWithSelectNone.cpp
+++ b/Modules/QtWidgets/src/QmitkDataStorageComboBoxWithSelectNone.cpp
@@ -1,196 +1,205 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) University College London (UCL).
 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 "QmitkDataStorageComboBoxWithSelectNone.h"
 #include <QDebug>
 
 const QString QmitkDataStorageComboBoxWithSelectNone::ZERO_ENTRY_STRING = "please select";
 
 //-----------------------------------------------------------------------------
 QmitkDataStorageComboBoxWithSelectNone::QmitkDataStorageComboBoxWithSelectNone(
     QWidget* parent,
     bool autoSelectNewNodes )
 : QmitkDataStorageComboBox(parent, autoSelectNewNodes)
 , m_CurrentPath("")
 {
 }
 
 
 //-----------------------------------------------------------------------------
 QmitkDataStorageComboBoxWithSelectNone::QmitkDataStorageComboBoxWithSelectNone(
     mitk::DataStorage* dataStorage,
     const mitk::NodePredicateBase* predicate,
     QWidget* parent, bool autoSelectNewNodes )
 : QmitkDataStorageComboBox(dataStorage, predicate, parent, autoSelectNewNodes)
 {
 }
 
 
 //-----------------------------------------------------------------------------
 QmitkDataStorageComboBoxWithSelectNone::~QmitkDataStorageComboBoxWithSelectNone()
 {
 }
 
 
 //-----------------------------------------------------------------------------
 int QmitkDataStorageComboBoxWithSelectNone::Find( const mitk::DataNode* dataNode ) const
 {
   int index = QmitkDataStorageComboBox::Find(dataNode);
   if (index != -1)
   {
     index += 1;
   }
   return index;
 }
 
 
 //-----------------------------------------------------------------------------
 mitk::DataNode::Pointer QmitkDataStorageComboBoxWithSelectNone::GetNode( int index ) const
 {
   mitk::DataNode::Pointer result = NULL;
 
   if (this->HasIndex(index))
   {
     if (index != 0)
     {
       result = m_Nodes.at(index - 1);
     }
   }
   return result;
 }
 
 
 //-----------------------------------------------------------------------------
 mitk::DataNode::Pointer QmitkDataStorageComboBoxWithSelectNone::GetSelectedNode() const
 {
   return this->GetNode(this->currentIndex());
 }
 
 
 //-----------------------------------------------------------------------------
 void QmitkDataStorageComboBoxWithSelectNone::SetSelectedNode(const mitk::DataNode::Pointer& node)
 {
   int currentIndex = -1;
   for (int i = 0; i < m_Nodes.size(); i++)
   {
     if (m_Nodes[i] == node.GetPointer())
     {
       currentIndex = i;
       break;
     }
   }
   if (currentIndex == -1)
   {
     // didn't find it, so set the value to 0.
     currentIndex = 0;
   }
   else
   {
     currentIndex += 1; // because the combo box contains "please select" at position zero.
   }
   this->setCurrentIndex(currentIndex);
 }
 
 //-----------------------------------------------------------------------------
 void QmitkDataStorageComboBoxWithSelectNone::RemoveNode( int index )
 {
   if(index > 0 && this->HasIndex(index))
   {
 
     // remove itk::Event observer
     mitk::DataNode* dataNode = m_Nodes.at(index - 1);
 
     // get name property first
     mitk::BaseProperty* nameProperty = dataNode->GetProperty("name");
 
     // if prop exists remove modified listener
     if(nameProperty)
     {
       nameProperty->RemoveObserver(m_NodesModifiedObserverTags[index-1]);
 
       // remove name property map
       m_PropertyToNode.erase(dataNode);
     }
 
     // then remove delete listener on the node itself
     dataNode->RemoveObserver(m_NodesDeleteObserverTags[index-1]);
 
     // remove observer tags from lists
     m_NodesModifiedObserverTags.erase(m_NodesModifiedObserverTags.begin()+index-1);
     m_NodesDeleteObserverTags.erase(m_NodesDeleteObserverTags.begin()+index-1);
 
     // remove node name from combobox
     this->removeItem(index);
 
     // remove node from node vector
     m_Nodes.erase(m_Nodes.begin()+index-1);
   }
 }
 
 
 //-----------------------------------------------------------------------------
 void QmitkDataStorageComboBoxWithSelectNone::SetNode(int index, const mitk::DataNode* dataNode)
 {
   if(index > 0 && this->HasIndex(index))
   {
-    QmitkDataStorageComboBox::InsertNode(index - 1, dataNode);
+    // if node identical, we only update the name in the QComboBoxItem
+    if( dataNode == this->m_Nodes.at(index-1 ) )
+    {
+      mitk::BaseProperty* nameProperty = dataNode->GetProperty("name");
+      std::string dataNodeNameStr = nameProperty->GetValueAsString();
+
+      this->setItemText(index, QString::fromStdString( dataNodeNameStr) );
+    }
+    else
+      QmitkDataStorageComboBox::InsertNode(index - 1, dataNode);
   }
 }
 
 
 //-----------------------------------------------------------------------------
 bool QmitkDataStorageComboBoxWithSelectNone::HasIndex(unsigned int index) const
 {
   return (m_Nodes.size() > 0 && index <= m_Nodes.size());
 }
 
 
 //-----------------------------------------------------------------------------
 void QmitkDataStorageComboBoxWithSelectNone::InsertNode(int index, const mitk::DataNode* dataNode)
 {
   if (index != 0)
   {
     QmitkDataStorageComboBox::InsertNode(index - 1, dataNode);
   }
 }
 
 
 //-----------------------------------------------------------------------------
 void QmitkDataStorageComboBoxWithSelectNone::Reset()
 {
   QmitkDataStorageComboBox::Reset();
   this->insertItem(0, ZERO_ENTRY_STRING);
 }
 
 
 //-----------------------------------------------------------------------------
 void QmitkDataStorageComboBoxWithSelectNone::SetZeroEntryText(const QString& zeroEntryString)
 {
   this->setItemText(0, zeroEntryString);
 }
 
 
 //-----------------------------------------------------------------------------
 QString QmitkDataStorageComboBoxWithSelectNone::currentValue() const
 {
   return m_CurrentPath;
 }
 
 
 //-----------------------------------------------------------------------------
 void QmitkDataStorageComboBoxWithSelectNone::setCurrentValue(const QString& path)
 {
   m_CurrentPath = path;
 }