diff --git a/OpenRPA.Interfaces/Input/InputDriver.cs b/OpenRPA.Interfaces/Input/InputDriver.cs
index 6deb81d3..1999f390 100644
--- a/OpenRPA.Interfaces/Input/InputDriver.cs
+++ b/OpenRPA.Interfaces/Input/InputDriver.cs
@@ -357,7 +357,7 @@ private void RaiseOnMouseUp(InputEventArgs e)
             if (OnMouseUp == null) return;
             try
             {
-                if (Element == null)
+                if (Element == null || OnMouseDown == null)
                 {
                     Element = AutomationHelper.GetFromPoint(e.X, e.Y);
                 }
diff --git a/OpenRPA.SAPBridge/Program.cs b/OpenRPA.SAPBridge/Program.cs
index 20a656d0..36ce416e 100644
--- a/OpenRPA.SAPBridge/Program.cs
+++ b/OpenRPA.SAPBridge/Program.cs
@@ -325,7 +325,7 @@ private static void Server_OnReceivedMessage(NamedPipeConnection<SAPEvent, SAPEv
                             overlay = recinfo.overlay;
                             //StartMonitorMouse(recinfo.mousemove);
                             form.AddText("StartMonitorMouse::begin");
-                            StartMonitorMouse(true);
+                            if(overlay) StartMonitorMouse(true);
                             form.AddText("StartMonitorMouse::end");
                         }
                         form.AddText("BeginRecord::begin");
diff --git a/OpenRPA.SAPBridge/SAPHook.cs b/OpenRPA.SAPBridge/SAPHook.cs
index ef3bb5f2..1a139fd7 100644
--- a/OpenRPA.SAPBridge/SAPHook.cs
+++ b/OpenRPA.SAPBridge/SAPHook.cs
@@ -372,7 +372,7 @@ private void Session_Change(GuiSession Session, GuiComponent Component, object C
             var ActionName = objs[1].ToString();
             upperFirstChar(ref ActionName);
             if (ActionName == "ResizeWorkingPane") return;
-
+            if (ActionName == "Maximize") return; 
             string id = Component.Id;
             var pathToRoot = new List<GuiComponent>();
             GuiComponent element = Component;
@@ -404,8 +404,8 @@ private void Session_Change(GuiSession Session, GuiComponent Component, object C
                 element = element.Parent as GuiComponent;
                 
             }
-
-                var e = new SAPRecordingEvent();
+            
+            var e = new SAPRecordingEvent();
             e.Action = Action;
             e.ActionName = ActionName;
             e.Name = Component.Name;
diff --git a/OpenRPA/OpenRPA.csproj b/OpenRPA/OpenRPA.csproj
index 323ebfc7..76e0d2ec 100644
--- a/OpenRPA/OpenRPA.csproj
+++ b/OpenRPA/OpenRPA.csproj
@@ -10,8 +10,9 @@
     <Description>Base UI of OpenRPA, used as part of OpenRPA robot</Description>
     <PackageLicenseExpression>MPL-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/open-rpa/openrpa</PackageProjectUrl>
-    <Version>1.0.137</Version>
-    <PackageReleaseNotes>1.0.137 Small improvements to detector
+    <Version>1.0.138</Version>
+    <PackageReleaseNotes>1.0.138 Fix windows click detector
+1.0.137 Small improvements to detector
 1.0.136 Improve parsing arguments when called remotely / Add Values to nmelement to support multi selects
 1.0.135 Update for new version of openflow
 1.0.134 fix orderby issue when fetching workflow and projects