diff --git a/src/ui/Controls/VideoPlayerContainer.cs b/src/ui/Controls/VideoPlayerContainer.cs
index 0203b099a..fb8ee0046 100644
--- a/src/ui/Controls/VideoPlayerContainer.cs
+++ b/src/ui/Controls/VideoPlayerContainer.cs
@@ -647,11 +647,20 @@ namespace Nikse.SubtitleEdit.Controls
             {
                 _panelControls.Visible = true;
                 _panelControls.BringToFront();
-                _panelSubtitle.Height -= ControlsHeight;
 
-                if (PanelPlayer.Dock == DockStyle.Fill)
+                var useCompleteFullscreen = VideoPlayer is LibMpvDynamic && Configuration.Settings.General.MpvHandlesPreviewText;
+                if (useCompleteFullscreen && PanelPlayer.Dock == DockStyle.Fill)
                 {
-                    PanelPlayer.Dock = DockStyle.None;
+                    // keep fullscreen
+                }
+                else
+                {
+                    _panelSubtitle.Height -= ControlsHeight;
+
+                    if (PanelPlayer.Dock == DockStyle.Fill)
+                    {
+                        PanelPlayer.Dock = DockStyle.None;
+                    }
                 }
             }
 
@@ -1272,6 +1281,16 @@ namespace Nikse.SubtitleEdit.Controls
             _pictureBoxFullscreen.Visible = false;
         }
 
+        public void SetFullFixed()
+        {
+            var useCompleteFullscreen = VideoPlayer is LibMpvDynamic && Configuration.Settings.General.MpvHandlesPreviewText;
+            if (useCompleteFullscreen)
+            {
+                PanelPlayer.Dock = DockStyle.Fill;
+                _panelControls.BringToFront();
+            }
+        }
+
         public void ShowFullScreenControls()
         {
             _pictureBoxFullscreen.Image = (Image)_resources.GetObject("pictureBoxNoFS.Image");
diff --git a/src/ui/Forms/VideoPlayerUndocked.cs b/src/ui/Forms/VideoPlayerUndocked.cs
index a739ff75d..1a98dcb5d 100644
--- a/src/ui/Forms/VideoPlayerUndocked.cs
+++ b/src/ui/Forms/VideoPlayerUndocked.cs
@@ -19,7 +19,7 @@ namespace Nikse.SubtitleEdit.Forms
         private readonly Keys _mainGeneralGoToPrevSubtitlePlayTranslate = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralGoToPrevSubtitlePlayTranslate);
         private bool _autoSized;
 
-        private Dictionary<DateTime, int> _mouseMoveDiff;
+        private readonly Dictionary<DateTime, int> _mouseMoveDiff;
         private int _mouseLastX = -1;
         private int _mouseLastY = -1;
 
@@ -240,6 +240,7 @@ namespace Nikse.SubtitleEdit.Forms
             _videoPlayerContainer.SetSubtitleFont();
             _videoPlayerContainer.SubtitleText = string.Empty;
             _videoPlayerContainer.ShowFullScreenControls();
+            _videoPlayerContainer.SetFullFixed();
             timer1.Start();
         }