diff --git a/plugins/performanceTesting/remote-driver/src/com/jetbrains/performancePlugin/remotedriver/robot/SmoothRobot.kt b/plugins/performanceTesting/remote-driver/src/com/jetbrains/performancePlugin/remotedriver/robot/SmoothRobot.kt
index 31e32b16e794..eb63a175ad84 100644
--- a/plugins/performanceTesting/remote-driver/src/com/jetbrains/performancePlugin/remotedriver/robot/SmoothRobot.kt
+++ b/plugins/performanceTesting/remote-driver/src/com/jetbrains/performancePlugin/remotedriver/robot/SmoothRobot.kt
@@ -201,15 +201,18 @@ internal class SmoothRobot @JvmOverloads constructor(
   fun selectAndDrag(component: Component, from: Point, to: Point, delayMs: Int) {
     moveMouse(component, from)
 
-    click(component, from)
-    pressMouse(RemoteMouseButton.LEFT)
+    try {
+      click(component, from)
+      pressMouse(RemoteMouseButton.LEFT)
 
-    Thread.sleep(delayMs.toLong())
-    moveMouse(component, to)
+      Thread.sleep(delayMs.toLong())
+      moveMouse(component, to)
 
-    Thread.sleep(delayMs.toLong())
-    moveMouse(component, to)
-    releaseMouse(RemoteMouseButton.LEFT)
+      Thread.sleep(delayMs.toLong())
+      moveMouse(component, to)
+    } finally {
+      releaseMouse(RemoteMouseButton.LEFT)
+    }
   }
 
   fun makeScreenshot(): ByteArray = makeScreenshot(Rectangle(Toolkit.getDefaultToolkit().screenSize))