diff --git a/app/DialogSubWindowSelector.cpp b/app/DialogSubWindowSelector.cpp
index d36876a..5ff083c 100644
--- a/app/DialogSubWindowSelector.cpp
+++ b/app/DialogSubWindowSelector.cpp
@@ -48,7 +48,7 @@ DialogSubWindowSelector::DialogSubWindowSelector( QWidget *parent, PlaYUVerSubWi
 
   minWindowsSelected = minWindowsSelected == 0 ? 1 : minWindowsSelected;
 
-  m_pcGroupCheckBox = new QGroupBox( tr( "Exclusive Radio Buttons" ) );
+  m_pcGroupCheckBox = new QGroupBox();
   m_pcGroupCheckBox->setLayout( new QVBoxLayout() );
 
   mainLayout->addWidget( m_pcGroupCheckBox );
@@ -85,6 +85,7 @@ DialogSubWindowSelector::DialogSubWindowSelector( QWidget *parent, PlaYUVerSubWi
   connect( m_mapperWindowsList, SIGNAL( mapped(int) ), this, SLOT( toggleSubWindow(int) ) );
 
   updateSubWindowList();
+  update();
 }
 
 Void DialogSubWindowSelector::updateSubWindowList()
@@ -106,7 +107,6 @@ Void DialogSubWindowSelector::updateSubWindowList()
     m_pcGroupCheckBox->layout()->addWidget( windowCheckBox );
     m_apcWindowsListCheckBox.append( windowCheckBox );
   }
-
 }
 
 Void DialogSubWindowSelector::selectSubWindow( SubWindowHandle* subWindow )
@@ -119,19 +119,15 @@ Void DialogSubWindowSelector::selectSubWindow( SubWindowHandle* subWindow )
   }
 }
 
-// -----------------------  Slot Functions  -----------------------
-
-Void DialogSubWindowSelector::toggleSubWindow( Int idx )
+Void DialogSubWindowSelector::update()
 {
-  Bool isChecked = m_apcWindowsListCheckBox.at( idx )->isChecked();
-
-  if( isChecked )
+  if( m_apcWindowsListCheckBox.size() > m_iMaxSlectedWindows )
   {
-    m_apcSelectedSubWindowList.append( m_apcSubWindowList.at( idx ) );
+    m_pushButtonAddAll->setEnabled( false );
   }
   else
   {
-    m_apcSelectedSubWindowList.removeOne( m_apcSubWindowList.at( idx ) );
+    m_pushButtonAddAll->setEnabled( true );
   }
 
   if( m_apcSelectedSubWindowList.size() > 0 )
@@ -156,22 +152,55 @@ Void DialogSubWindowSelector::toggleSubWindow( Int idx )
   {
     if( m_apcSelectedSubWindowList.size() >= m_iMaxSlectedWindows )
     {
-      m_pcGroupCheckBox->setEnabled( false );
+      for( Int i = 0; i < m_apcWindowsListCheckBox.size(); i++ )
+      {
+        if( m_apcSelectedSubWindowList.contains( m_apcSubWindowList.at( i ) ) )
+        {
+          m_apcWindowsListCheckBox.at( i )->setEnabled( true );
+        }
+        else
+        {
+          m_apcWindowsListCheckBox.at( i )->setEnabled( false );
+        }
+      }
     }
     else
     {
-      m_pcGroupCheckBox->setEnabled( true );
+      for( Int i = 0; i < m_apcWindowsListCheckBox.size(); i++ )
+      {
+        m_apcWindowsListCheckBox.at( i )->setEnabled( true );
+      }
     }
   }
 }
 
+// -----------------------  Slot Functions  -----------------------
+
+Void DialogSubWindowSelector::toggleSubWindow( Int idx )
+{
+  Bool isChecked = m_apcWindowsListCheckBox.at( idx )->isChecked();
+
+  if( isChecked )
+  {
+    m_apcSelectedSubWindowList.append( m_apcSubWindowList.at( idx ) );
+  }
+  else
+  {
+    Bool bRemoved = m_apcSelectedSubWindowList.removeOne( m_apcSubWindowList.at( idx ) );
+    assert( bRemoved );
+  }
+  update();
+}
+
 Void DialogSubWindowSelector::addAllSubWindow()
 {
+  m_apcSelectedSubWindowList.clear();
   for( Int i = 0; i < m_apcWindowsListCheckBox.size(); i++ )
   {
     m_apcWindowsListCheckBox.at( i )->setChecked( true );
     m_apcSelectedSubWindowList.append( m_apcSubWindowList.at( i ) );
   }
+  update();
 }
 
 Void DialogSubWindowSelector::removeAllSubWindow()
@@ -181,6 +210,7 @@ Void DialogSubWindowSelector::removeAllSubWindow()
     m_apcWindowsListCheckBox.at( i )->setChecked( false );
   }
   m_apcSelectedSubWindowList.clear();
+  update();
 }
 
 }  // Namespace SCode
diff --git a/app/DialogSubWindowSelector.h b/app/DialogSubWindowSelector.h
index 704ddef..99a4806 100644
--- a/app/DialogSubWindowSelector.h
+++ b/app/DialogSubWindowSelector.h
@@ -88,6 +88,7 @@ private:
   QListWidget* m_listSelectedWindows;
 
   Void updateSubWindowList();
+  Void update();
 
 private Q_SLOTS:
   void toggleSubWindow( int );
diff --git a/app/ModulesHandle.cpp b/app/ModulesHandle.cpp
index aeb7503..4781f0f 100644
--- a/app/ModulesHandle.cpp
+++ b/app/ModulesHandle.cpp
@@ -253,6 +253,7 @@ Void ModulesHandle::enableModuleIf( PlaYUVerAppModuleIf *pcCurrModuleIf )
   if( numberOfFrames > MODULE_REQUIRES_ONE_FRAME )  // Show dialog to select sub windows
   {
     DialogSubWindowSelector dialogWindowsSelection( m_pcParent, m_pcMainWindowManager, SubWindowHandle::VIDEO_SUBWINDOW, numberOfFrames, numberOfFrames );
+    dialogWindowsSelection.selectSubWindow( pcVideoSubWindow );
     if( dialogWindowsSelection.exec() == QDialog::Accepted )
     {
       VideoSubWindow *videoSubWindow;
diff --git a/app/VideoHandle.cpp b/app/VideoHandle.cpp
index e06a4ac..91d0a4b 100644
--- a/app/VideoHandle.cpp
+++ b/app/VideoHandle.cpp
@@ -580,10 +580,10 @@ Void VideoHandle::videoSelectionButtonEvent()
   {
     m_acPlayingSubWindows.clear();
     VideoSubWindow *videoSubWindow;
-    QList<SubWindowHandle*> subWindowList = dialogWindowsSelection.getSelectedWindows();
-    for( Int i = 0; i < subWindowList.size(); i++ )
+    QList<SubWindowHandle*> selectedSubWindowList = dialogWindowsSelection.getSelectedWindows();
+    for( Int i = 0; i < selectedSubWindowList.size(); i++ )
     {
-      videoSubWindow = qobject_cast<VideoSubWindow*>( subWindowList.at( i ) );
+      videoSubWindow = qobject_cast<VideoSubWindow*>( selectedSubWindowList.at( i ) );
       m_acPlayingSubWindows.append( videoSubWindow );
     }
     if( m_acPlayingSubWindows.size() > 0 )