diff --git a/app/QualityHandle.cpp b/app/QualityHandle.cpp
index 3b17d54..cc21856 100644
--- a/app/QualityHandle.cpp
+++ b/app/QualityHandle.cpp
@@ -106,7 +106,6 @@ Void QualityHandle::writeSettings()
 
 Void QualityHandle::update( VideoSubWindow* currSubWindow )
 {
-  m_pcQualityHandleSideBar->updateSubWindowList();
   m_pcQualityHandleSideBar->updateCurrentWindow( currSubWindow );
 }
 
diff --git a/app/QualityMeasurementSidebar.cpp b/app/QualityMeasurementSidebar.cpp
index e1b2a09..7e3f651 100644
--- a/app/QualityMeasurementSidebar.cpp
+++ b/app/QualityMeasurementSidebar.cpp
@@ -167,6 +167,7 @@ Void QualityMeasurementSidebar::updateCurrentWindow( VideoSubWindow *subWindow )
       index = m_pcVideoWindowList.indexOf( refSubWindow );
     }
     m_comboBoxRef->setCurrentIndex( index );
+    updateSubWindowList();
     updateSidebarData();
   }
 }
diff --git a/app/plaYUVerApp.cpp b/app/plaYUVerApp.cpp
index a2c7fff..e56a9b4 100644
--- a/app/plaYUVerApp.cpp
+++ b/app/plaYUVerApp.cpp
@@ -455,8 +455,9 @@ Void plaYUVerApp::update()
 {
   SubWindowHandle *new_window = activeSubWindow();
   QCoreApplication::processEvents();
-  if( activeSubWindow() != m_pcCurrentSubWindow )
+  //if( activeSubWindow() != m_pcCurrentSubWindow )
   {
+    m_pcCurrentSubWindow = NULL;
     if( activeSubWindow() )
     {
       m_pcCurrentSubWindow = new_window;