diff --git a/Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.cpp b/Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.cpp
index c02f03b73b..9edf78a465 100644
--- a/Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.cpp
+++ b/Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.cpp
@@ -1,83 +1,101 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 //#define _USE_MATH_DEFINES
 #include <QmitkUSDeviceManagerWidget.h>
 
 
 const std::string QmitkUSDeviceManagerWidget::VIEW_ID = "org.mitk.views.QmitkUSDeviceManagerWidget";
 
 QmitkUSDeviceManagerWidget::QmitkUSDeviceManagerWidget(QWidget* parent, Qt::WindowFlags f): QWidget(parent, f) 
 {
   m_Controls = NULL;
   CreateQtPartControl(this);
 }
 
 QmitkUSDeviceManagerWidget::~QmitkUSDeviceManagerWidget()
 {
 }
 
 //////////////////// INITIALIZATION /////////////////////
 
 void QmitkUSDeviceManagerWidget::CreateQtPartControl(QWidget *parent)
 {
   if (!m_Controls)
   {
     // create GUI widgets
     m_Controls = new Ui::QmitkUSDeviceManagerWidgetControls;
     m_Controls->setupUi(parent);
     this->CreateConnections();
   }
 
   // Initializations
   std::string empty = "";
   m_Controls->m_ConnectedDevices->Initialize<mitk::USDevice>(mitk::USImageMetadata::PROP_DEV_MODEL, empty);
 }
 
 void QmitkUSDeviceManagerWidget::CreateConnections()
 {
   if ( m_Controls )
   {
-    connect( m_Controls->m_BtnActivate,   SIGNAL(clicked()), this, SLOT(OnClickedActivateDevice()) );
-    connect( m_Controls->m_BtnDisconnect, SIGNAL(clicked()), this, SLOT(OnClickedDisconnectDevice()) );
-    connect( m_Controls->m_ConnectedDevices, SIGNAL(currentItemChanged( QListWidgetItem *, QListWidgetItem *)), this, SLOT(OnDeviceSelectionChanged()) );
+    connect( m_Controls->m_BtnActivate,   SIGNAL( clicked() ), this, SLOT(OnClickedActivateDevice()) );
+    connect( m_Controls->m_BtnDisconnect, SIGNAL( clicked() ), this, SLOT(OnClickedDisconnectDevice()) );
+    connect( m_Controls->m_ConnectedDevices, SIGNAL( ServiceSelectionChanged(mitk::ServiceReference) ), this, SLOT(OnDeviceSelectionChanged(mitk::ServiceReference)) );
   }
 }
 
 
 ///////////// Methods & Slots Handling Direct Interaction /////////////////
 
 void QmitkUSDeviceManagerWidget::OnClickedActivateDevice()
 {
   mitk::USDevice::Pointer device = m_Controls->m_ConnectedDevices->GetSelectedServiceAsClass<mitk::USDevice>();
   if (device.IsNull()) return;
   if (device->GetIsActive()) device->Deactivate();
   else device->Activate();
+
+  // Manually reevaluate Button logic
+  OnDeviceSelectionChanged(m_Controls->m_ConnectedDevices->GetSelectedService());
 }
 
 void QmitkUSDeviceManagerWidget::OnClickedDisconnectDevice(){
   mitk::USDevice::Pointer device = m_Controls->m_ConnectedDevices->GetSelectedServiceAsClass<mitk::USDevice>();
   if (device.IsNull()) return;
   device->Disconnect();
 }
 
-void QmitkUSDeviceManagerWidget::OnDeviceSelectionChanged(){
-  mitk::USDevice::Pointer device = m_Controls->m_ConnectedDevices->GetSelectedServiceAsClass<mitk::USDevice>();
-  if (device.IsNull()) return;
-  if (device->GetIsActive()) m_Controls->m_BtnActivate->setText("Deactivate");
-    else m_Controls->m_BtnActivate->setText("Activate");
+void QmitkUSDeviceManagerWidget::OnDeviceSelectionChanged(mitk::ServiceReference reference){
+  if (! reference)
+  {
+    m_Controls->m_BtnActivate->setEnabled(false);
+    m_Controls->m_BtnDisconnect->setEnabled(false);
+    return;
+  }
+  std::string isActive = reference.GetProperty("IsActive").ToString();
+  if (isActive.compare("true") == 0) 
+  {
+    m_Controls->m_BtnActivate->setEnabled(true);
+    m_Controls->m_BtnDisconnect->setEnabled(false);
+    m_Controls->m_BtnActivate->setText("Deactivate");
+  }
+  else
+  {
+    m_Controls->m_BtnActivate->setEnabled(true);
+    m_Controls->m_BtnDisconnect->setEnabled(true);
+    m_Controls->m_BtnActivate->setText("Activate");
+  }
 }
 
diff --git a/Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.h b/Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.h
index d5a4800c0e..425ee54ca1 100644
--- a/Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.h
+++ b/Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.h
@@ -1,85 +1,85 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #ifndef _QmitkUSDeviceManagerWidget_H_INCLUDED
 #define _QmitkUSDeviceManagerWidget_H_INCLUDED
 
 #include "MitkUSUIExports.h"
 #include "ui_QmitkUSDeviceManagerWidgetControls.h"
 #include "mitkUSDevice.h"
 #include <vector>
 
 //QT headers
 #include <QWidget>
 #include <QListWidgetItem>
 
 
 
 /**
 * @brief This Widget is used to manage available Ultrasound Devices.
 *
 * It allows activation, deactivation and disconnection of connected devices.
 *
 * @ingroup USUI
 */
 class MitkUSUI_EXPORT QmitkUSDeviceManagerWidget :public QWidget
 {
 
   //this is needed for all Qt objects that should have a MOC object (everything that derives from QObject)
   Q_OBJECT
 
   public:
 
     static const std::string VIEW_ID;
 
     QmitkUSDeviceManagerWidget(QWidget* p = 0, Qt::WindowFlags f1 = 0);
     virtual ~QmitkUSDeviceManagerWidget();
 
     /* @brief This method is part of the widget an needs not to be called seperately. */
     virtual void CreateQtPartControl(QWidget *parent);
     /* @brief This method is part of the widget an needs not to be called seperately. (Creation of the connections of main and control widget.)*/
     virtual void CreateConnections();
 
   public slots:
 
   protected slots:
   
     /*
     \brief Called, when the button "Activate Device" was clicked.
     */
     void OnClickedActivateDevice();
 
     /*
     \brief Called, when the button "Disconnect Device" was clicked.
     */
     void OnClickedDisconnectDevice();   
 
     /*
     \brief Called, when the selection in the devicelist changes.
     */
-    void OnDeviceSelectionChanged();   
+    void OnDeviceSelectionChanged(mitk::ServiceReference reference);   
 
 
   protected:
 
     Ui::QmitkUSDeviceManagerWidgetControls* m_Controls; ///< member holding the UI elements of this widget
 
   private:
 
    
 };
 
 #endif // _QmitkUSDeviceManagerWidget_H_INCLUDED