diff --git a/Gui/mplayer/sw.h b/Gui/mplayer/sw.h
index 134debd6e0..a97dc88921 100644
--- a/Gui/mplayer/sw.h
+++ b/Gui/mplayer/sw.h
@@ -7,7 +7,6 @@ int             SubVisible = 0;
 void mplSubDraw( wsParamDisplay )
 {
  if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible=0;
- 
  if ( !appMPlayer.subWindow.Mapped ||
       appMPlayer.subWindow.Visible == wsWindowNotVisible ) return;
 
@@ -62,7 +61,12 @@ void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
            }
           break;
    case wsRLMouseButton:
-          if ( ( !mplSubMoved )&&( ( SubVisible++%2 ) ) ) wsMoveTopWindow( &appMPlayer.mainWindow );
+//          if ( ( !mplSubMoved )&&( ( SubVisible++%2 ) ) ) wsMoveTopWindow( &appMPlayer.mainWindow );
+          if ( !mplSubMoved )
+	   {
+	    if( SubVisible++%2 ) wsMoveTopWindow( &appMPlayer.subWindow );
+	     else wsMoveTopWindow( &appMPlayer.mainWindow );
+	   }
           msButton=0;
           mplSubMoved=0;
           break;
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c
index dc6c1ec9b2..b8d278383a 100644
--- a/Gui/wm/ws.c
+++ b/Gui/wm/ws.c
@@ -856,8 +856,8 @@ void wsIconify( wsTWindow win )
 //    Move top the window.
 // ----------------------------------------------------------------------------------------------
 void wsMoveTopWindow( wsTWindow * win )
-//{ XRaiseWindow( wsDisplay,win->WindowID ); }
-{ XUnmapWindow( wsDisplay,win->WindowID ); XMapWindow( wsDisplay,win->WindowID ); }
+{ XRaiseWindow( wsDisplay,win->WindowID ); }
+//{ XUnmapWindow( wsDisplay,win->WindowID ); XMapWindow( wsDisplay,win->WindowID ); }
 
 // ----------------------------------------------------------------------------------------------
 //    Set window background to 'color'.