diff --git a/app/ModulesHandle.cpp b/app/ModulesHandle.cpp
index 4781f0f..ebcddcb 100644
--- a/app/ModulesHandle.cpp
+++ b/app/ModulesHandle.cpp
@@ -253,7 +253,20 @@ 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 );
+    QList<SubWindowHandle*> windowsList = m_pcMainWindowManager->findSubWindow( SubWindowHandle::VIDEO_SUBWINDOW );
+
+    if( windowsList.size() <= numberOfFrames )
+    {
+      for( Int i = 0; i < windowsList.size(); i++ )
+      {
+        dialogWindowsSelection.selectSubWindow( windowsList.at( i ) );
+      }
+    }
+    else
+    {
+      dialogWindowsSelection.selectSubWindow( pcVideoSubWindow );
+    }
+
     if( dialogWindowsSelection.exec() == QDialog::Accepted )
     {
       VideoSubWindow *videoSubWindow;