diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/recorder/EventDispatcher.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/recorder/EventDispatcher.kt
index 116d8bc5fafd..9eb0a24b3168 100644
--- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/recorder/EventDispatcher.kt
+++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/recorder/EventDispatcher.kt
@@ -68,11 +68,12 @@ object EventDispatcher {
 
   fun processMouseEvent(event: MouseEvent) {
     if (isMainFrame(event.component)) return
-    if (event.id == MOUSE_CLICKED) processClick(event)
-    if (event.id == MOUSE_DRAGGED) SelectionProcessor.processDragging(event)
-    if (event.id == MOUSE_RELEASED) SelectionProcessor.stopDragging(event)
-    if (event.component?.javaClass?.canonicalName == "javax.swing.Popup.HeavyWeightWindow"
-    && event.id == MOUSE_PRESSED) processClick(event) //clicks are consumed for popups, so let's process MOUSE_PRESSED event GUI-79
+    when(event.id) {
+      MOUSE_CLICKED -> { processClick(event) }
+      MOUSE_DRAGGED -> { SelectionProcessor.processDragging(event) }
+      MOUSE_RELEASED -> { SelectionProcessor.stopDragging(event) }
+      MOUSE_PRESSED -> { if (event.component?.javaClass?.canonicalName == "javax.swing.Popup.HeavyWeightWindow") processClick(event) } //clicks are consumed for popups, so let's process MOUSE_PRESSED event GUI-79
+    }
   }
 
   private fun processClick(event: MouseEvent){