diff --git a/ShareX/Tools/PinToScreen/PinToScreenForm.Designer.cs b/ShareX/Tools/PinToScreen/PinToScreenForm.Designer.cs
index a649a6fe6..f56ff9892 100644
--- a/ShareX/Tools/PinToScreen/PinToScreenForm.Designer.cs
+++ b/ShareX/Tools/PinToScreen/PinToScreenForm.Designer.cs
@@ -35,6 +35,7 @@ private void InitializeComponent()
             this.tsbOptions,
             this.tsbClose});
             this.tsMain.Name = "tsMain";
+            this.tsMain.MouseLeave += new System.EventHandler(this.tsMain_MouseLeave);
             // 
             // tsbCopy
             // 
diff --git a/ShareX/Tools/PinToScreen/PinToScreenForm.cs b/ShareX/Tools/PinToScreen/PinToScreenForm.cs
index d61472905..378d30e92 100644
--- a/ShareX/Tools/PinToScreen/PinToScreenForm.cs
+++ b/ShareX/Tools/PinToScreen/PinToScreenForm.cs
@@ -214,9 +214,9 @@ protected override void Dispose(bool disposing)
 
         private void UpdateControls()
         {
-            int toolbarMargin = 10;
+            int toolbarMargin = 20;
             tsMain.Visible = ClientRectangle.Contains(PointToClient(MousePosition)) &&
-                ClientRectangle.Contains(new Rectangle(0, 0, (Options.Border ? Options.BorderSize * 2 : 0) + tsMain.Width + toolbarMargin * 2,
+                ClientRectangle.Contains(new Rectangle(0, 0, (Options.Border ? Options.BorderSize * 2 : 0) + tsMain.Width + toolbarMargin,
                 (Options.Border ? Options.BorderSize * 2 : 0) + tsMain.Height + toolbarMargin));
             tslScale.Text = ImageScale + "%";
         }
@@ -501,6 +501,11 @@ private void PinToScreenForm_MouseLeave(object sender, EventArgs e)
             UpdateControls();
         }
 
+        private void tsMain_MouseLeave(object sender, EventArgs e)
+        {
+            UpdateControls();
+        }
+
         private void PinToScreenForm_KeyUp(object sender, KeyEventArgs e)
         {
             switch (e.KeyData)
diff --git a/ShareX/Tools/PinToScreen/PinToScreenForm.resx b/ShareX/Tools/PinToScreen/PinToScreenForm.resx
index 1f13e5d2a..38628b073 100644
--- a/ShareX/Tools/PinToScreen/PinToScreenForm.resx
+++ b/ShareX/Tools/PinToScreen/PinToScreenForm.resx
@@ -181,7 +181,7 @@
     <value>tsMain</value>
   </data>
   <data name="&gt;&gt;tsMain.Type" xml:space="preserve">
-    <value>ShareX.HelpersLib.ToolStripEx, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>ShareX.HelpersLib.ToolStripEx, ShareX.HelpersLib, Version=16.0.1.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;tsMain.Parent" xml:space="preserve">
     <value>$this</value>