diff --git a/app/ModulesHandle.cpp b/app/ModulesHandle.cpp
index dce174a..7bc7349 100644
--- a/app/ModulesHandle.cpp
+++ b/app/ModulesHandle.cpp
@@ -353,7 +353,6 @@ Void ModulesHandle::activateModule()
     if( ( pcCurrAppModuleIf->m_pcModule->m_uiModuleRequirements & MODULE_REQUIRES_NEW_WINDOW ) || bShowModulesNewWindow )
     {
       pcModuleSubWindow = new VideoSubWindow( VideoSubWindow::MODULE_SUBWINDOW );
-      pcModuleSubWindow->setWindowShortName( windowName );
       pcModuleSubWindow->setWindowName( windowName );
 
       connect( pcModuleSubWindow->getViewArea(), SIGNAL( selectionChanged( QRect ) ), m_appModuleVideo, SLOT( updateSelectionArea( QRect ) ) );
@@ -363,6 +362,14 @@ Void ModulesHandle::activateModule()
 
       pcCurrAppModuleIf->m_pcDisplaySubWindow = pcModuleSubWindow;
     }
+    else
+    {
+      QString windowName = videoSubWindowList.at( 0 )->getWindowName();
+      windowName.append( QStringLiteral( " - Module " ) );
+      windowName.append( pcCurrAppModuleIf->m_pcModule->m_pchModuleName );
+      videoSubWindowList.at( 0 )->setWindowName( windowName );
+
+    }
   }
   else if( pcCurrAppModuleIf->m_pcModule->m_iModuleType == FRAME_MEASUREMENT_MODULE )
   {
diff --git a/app/QualityMeasurementSidebar.cpp b/app/QualityMeasurementSidebar.cpp
index b8772bc..da278b1 100644
--- a/app/QualityMeasurementSidebar.cpp
+++ b/app/QualityMeasurementSidebar.cpp
@@ -151,7 +151,7 @@ Void QualityMeasurementSidebar::updateSubWindowList()
         continue;
       }
     }
-    currSubWindowName = pcVideoSubWindow->getWindowShortName();
+    currSubWindowName = pcVideoSubWindow->getWindowName();
     m_pcWindowListNames.append( currSubWindowName );
     m_pcVideoWindowList.append( pcVideoSubWindow );
   }
diff --git a/app/VideoSubWindow.cpp b/app/VideoSubWindow.cpp
index 5cc735a..44bab92 100644
--- a/app/VideoSubWindow.cpp
+++ b/app/VideoSubWindow.cpp
@@ -232,11 +232,6 @@ Bool VideoSubWindow::loadFile( QString cFilename, Bool bForceDialog )
   {
     m_pCurrStream = new PlaYUVerStream;
   }
-//  else
-//  {
-//    delete m_pCurrStream;
-//    m_pCurrStream = new PlaYUVerStream;
-//  }
 
   if( guessFormat( cFilename, Width, Height, InputFormat, FrameRate ) || bForceDialog )
   {
@@ -274,11 +269,10 @@ Bool VideoSubWindow::loadFile( QString cFilename, Bool bForceDialog )
   refreshFrame();
 
   m_cFilename = cFilename;
-  m_cWindowShortName = QFileInfo( cFilename ).fileName();
 
   updateVideoWindowInfo();
 
-  setWindowName( m_cWindowShortName );
+
   return true;
 }
 
@@ -296,7 +290,6 @@ Bool VideoSubWindow::loadFile( PlaYUVerStreamInfo* streamInfo )
   }
 
   m_sStreamInfo = *streamInfo;
-
   m_cViewArea->setInputStream( m_pCurrStream );
 
   QApplication::restoreOverrideCursor();
@@ -304,11 +297,8 @@ Bool VideoSubWindow::loadFile( PlaYUVerStreamInfo* streamInfo )
   refreshFrame();
 
   m_cFilename = streamInfo->m_cFilename;
-  m_cWindowShortName = QFileInfo( streamInfo->m_cFilename ).fileName();
-
   updateVideoWindowInfo();
-
-  setWindowName( m_cWindowShortName );
+  setWindowName( QFileInfo( m_cFilename ).fileName() );
   return true;
 }
 
diff --git a/app/VideoSubWindow.h b/app/VideoSubWindow.h
index d51ee5c..71752c6 100644
--- a/app/VideoSubWindow.h
+++ b/app/VideoSubWindow.h
@@ -90,7 +90,7 @@ private:
 
   VideoSubWindow* m_pcReferenceSubWindow;
 
-  QString m_cWindowShortName;
+  //QString m_cWindowShortName;
   QString m_cCurrFileName;
 
   Bool m_bIsPlaying;
@@ -235,14 +235,6 @@ public:
   QSize sizeHint() const;
   QSize sizeHint( const QSize & ) const;
 
-  Void setWindowShortName( const QString& name )
-  {
-    m_cWindowShortName = name;
-  }
-  QString getWindowShortName()
-  {
-    return m_cWindowShortName;
-  }
   QString getCurrentFileName()
   {
     return m_cFilename;