diff --git a/source/app/DialogSubWindowSelector.cpp b/source/app/DialogSubWindowSelector.cpp
index d1e5ef6..525e4bf 100755
--- a/source/app/DialogSubWindowSelector.cpp
+++ b/source/app/DialogSubWindowSelector.cpp
@@ -118,6 +118,14 @@ Void DialogSubWindowSelector::updateSubWindowList()
   m_comboBoxWindowList->setCurrentIndex( -1 );
 }
 
+Void DialogSubWindowSelector::setSubWindowList( QStringList cWindowListNames )
+{
+  m_pcSelectedWindowListNames = cWindowListNames;
+  m_listSelectedWindows->clear();
+  m_listSelectedWindows->insertItems( 0, cWindowListNames );
+  updateSubWindowList();
+}
+
 // -----------------------  Slot Functions  -----------------------
 
 void DialogSubWindowSelector::addSubWindow()
diff --git a/source/app/DialogSubWindowSelector.h b/source/app/DialogSubWindowSelector.h
index efacf4c..3c112dd 100755
--- a/source/app/DialogSubWindowSelector.h
+++ b/source/app/DialogSubWindowSelector.h
@@ -52,6 +52,8 @@ Q_OBJECT
 
 public:
   DialogSubWindowSelector( QWidget *parent = 0, QMdiArea *mdiArea = 0 );
+
+  Void setSubWindowList( QStringList cWindowListNames );
   QStringList getSelectedWindows()
   {
     return m_pcSelectedWindowListNames;
@@ -68,8 +70,6 @@ private:
 
   Void updateSubWindowList();
 
-
-
 private Q_SLOTS:
   void addSubWindow();
   void removeSubWindow();
diff --git a/source/app/plaYUVerApp.cpp b/source/app/plaYUVerApp.cpp
index 5e3f1ce..06f6790 100644
--- a/source/app/plaYUVerApp.cpp
+++ b/source/app/plaYUVerApp.cpp
@@ -539,6 +539,12 @@ void plaYUVerApp::lockButtonEvent()
 void plaYUVerApp::videoSelectionButtonEvent()
 {
   DialogSubWindowSelector dialogWindowsSelection( this, mdiArea );
+  QStringList cWindowListNames;
+  for(Int i=0; i<m_acPlayingSubWindows.size();i++)
+  {
+    cWindowListNames.append( m_acPlayingSubWindows.at(i)->getWindowName() );
+    dialogWindowsSelection.setSubWindowList( cWindowListNames );
+  }
   if( dialogWindowsSelection.exec() == QDialog::Accepted )
   {
     QStringList selectedWindows = dialogWindowsSelection.getSelectedWindows();