diff --git a/Source/Editor/GUI/Docking/WindowDragHelper.cs b/Source/Editor/GUI/Docking/WindowDragHelper.cs
index 22903e95e..f07d1f87d 100644
--- a/Source/Editor/GUI/Docking/WindowDragHelper.cs
+++ b/Source/Editor/GUI/Docking/WindowDragHelper.cs
@@ -279,6 +279,7 @@ namespace FlaxEditor.GUI.Docking
 
                 // Make sure the all the dock hint areas are not under other windows
                 _toDock?.RootWindow.Window.BringToFront();
+                //_toDock?.RootWindow.Window.Focus();
 
                 // Make the dragged window transparent when dock hints are visible
                 _toMove.Window.Window.Opacity = _toDock == null ? 1.0f : DragWindowOpacity;
@@ -431,8 +432,9 @@ namespace FlaxEditor.GUI.Docking
         private void OnUpdate()
         {
             var mousePos = Platform.MousePosition;
-            if (_toMove.Window.Window.IsFocused)
-                return; // Filter out mouse updates after dragging is over in dragged window
+            //needs to be commented out for X11, enabled for Wayland or Windows?
+            //if (_toMove.Window.Window.IsFocused)
+            //    return; // Filter out mouse updates after dragging is over in dragged window
             
             if (_mouse != mousePos)
                 OnMouseMove(mousePos);