diff --git a/Tools/UIRecorder/UIRecorder/RecordedUiTask.cs b/Tools/UIRecorder/UIRecorder/RecordedUiTask.cs
index fffae104..faba6d33 100644
--- a/Tools/UIRecorder/UIRecorder/RecordedUiTask.cs
+++ b/Tools/UIRecorder/UIRecorder/RecordedUiTask.cs
@@ -304,16 +304,16 @@ public static string LeftClick(RecordedUiTask uiTask, string elemName)
 
         public static string DoubleClick(RecordedUiTask uiTask, string elemName)
         {
-            string codeLine = $"    desktopSession.DesktopSessionElement.Mouse.MouseMove(winElem_{elemName}.Coordinates);\n" +
-                            $"    desktopSession.DesktopSessionElement.Mouse.DoubleClick(null);\n";
+            string codeLine = $"    Actions actions = new Actions(desktopSession.DesktopSessionElement);\n" +
+                            $"    actions.DoubleClick(winElem_{elemName}).Build().Perform();\n";
 
             return GetCodeBlock(uiTask, elemName, codeLine);
         }
 
         public static string RightClick(RecordedUiTask uiTask, string elemName)
         {
-            string codeLine = $"    desktopSession.DesktopSessionElement.Mouse.MouseMove(winElem_{elemName}.Coordinates);\n" +
-                            $"    desktopSession.DesktopSessionElement.Mouse.ContextClick(null);\n";
+            string codeLine = $"    Actions actions = new Actions(desktopSession.DesktopSessionElement);\n" +
+                            $"    actions.ContextClick(winElem_{elemName}).Build().Perform();\n";
 
             return GetCodeBlock(uiTask, elemName, codeLine);
         }