diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c
index bbc69fbc1e..b2c8f9615d 100644
--- a/Gui/mplayer/mw.c
+++ b/Gui/mplayer/mw.c
@@ -285,24 +285,28 @@ set_volume:
     	btnSet( evFullScreen,btnReleased );
         if ( guiIntfStruct.Playing )
          {
-          appMPlayer.subWindow.isFullScreen=True;
-          appMPlayer.subWindow.OldX=( wsMaxX - guiIntfStruct.MovieWidth * 2 ) / 2 + wsOrgX;
-          appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight * 2 ) / 2 + wsOrgY;
-          appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth * 2; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight * 2;
-          wsFullScreen( &appMPlayer.subWindow );
-	  vo_fs=0;
+          if ( appMPlayer.subWindow.isFullScreen )
+           {
+            mplFullScreen();
+           }
+          wsResizeWindow( &appMPlayer.subWindow, guiIntfStruct.MovieWidth * 2, guiIntfStruct.MovieHeight * 2 );
+          wsMoveWindow( &appMPlayer.subWindow, 0,
+                        ( wsMaxX - guiIntfStruct.MovieWidth*2  )/2 + wsOrgX,
+                        ( wsMaxY - guiIntfStruct.MovieHeight*2 )/2 + wsOrgY  );
          }
         break;
    case evNormalSize:
 	btnSet( evFullScreen,btnReleased );
         if ( guiIntfStruct.Playing )
          {
-          appMPlayer.subWindow.isFullScreen=True;
-          appMPlayer.subWindow.OldX=( wsMaxX - guiIntfStruct.MovieWidth ) / 2 + wsOrgX;
-          appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight ) / 2 + wsOrgY;
-          appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight;
-          wsFullScreen( &appMPlayer.subWindow );
-	  vo_fs=0;
+          if ( appMPlayer.subWindow.isFullScreen )
+           {
+            mplFullScreen();
+           }
+          wsResizeWindow( &appMPlayer.subWindow, guiIntfStruct.MovieWidth, guiIntfStruct.MovieHeight );
+          wsMoveWindow( &appMPlayer.subWindow, 0,
+                        ( wsMaxX - guiIntfStruct.MovieWidth  )/2 + wsOrgX,
+                        ( wsMaxY - guiIntfStruct.MovieHeight )/2 + wsOrgY  );
 	  break;
          } else if ( !appMPlayer.subWindow.isFullScreen ) break;
    case evFullScreen: