diff --git a/projector-awt/src/main/kotlin/org/jetbrains/projector/awt/PWindow.kt b/projector-awt/src/main/kotlin/org/jetbrains/projector/awt/PWindow.kt
index 39d22704..cc4eda09 100644
--- a/projector-awt/src/main/kotlin/org/jetbrains/projector/awt/PWindow.kt
+++ b/projector-awt/src/main/kotlin/org/jetbrains/projector/awt/PWindow.kt
@@ -102,7 +102,7 @@ class PWindow private constructor(val target: Component, private val isAgent: Bo
       else -> null
     }
 
-  private val thisWindow: Component?
+  val thisWindow: Component?
     get() = when (target) {
       is Window -> target
       else -> SwingUtilities.getWindowAncestor(target)
diff --git a/projector-server/src/main/kotlin/org/jetbrains/projector/server/ProjectorServer.kt b/projector-server/src/main/kotlin/org/jetbrains/projector/server/ProjectorServer.kt
index a33909ca..b7d6700b 100644
--- a/projector-server/src/main/kotlin/org/jetbrains/projector/server/ProjectorServer.kt
+++ b/projector-server/src/main/kotlin/org/jetbrains/projector/server/ProjectorServer.kt
@@ -363,7 +363,7 @@ class ProjectorServer private constructor(
 
         PMouseInfoPeer.lastMouseCoords.setLocation(shiftedMessage.x, shiftedMessage.y)
 
-        val window = PWindow.getWindow(message.windowId)?.target
+        val window = PWindow.getWindow(message.windowId)?.thisWindow
         PMouseInfoPeer.lastWindowUnderMouse = window
 
         window ?: return@invokeLater