diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll
index b62a2328..1d9442d3 100644
Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ
diff --git a/Bin/net45/SunnyUI.dll b/Bin/net45/SunnyUI.dll
index 8d29809d..7e1499ae 100644
Binary files a/Bin/net45/SunnyUI.dll and b/Bin/net45/SunnyUI.dll differ
diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll
index 852e25d0..11ad7236 100644
Binary files a/Bin/net5.0-windows/SunnyUI.dll and b/Bin/net5.0-windows/SunnyUI.dll differ
diff --git a/Bin/net5.0-windows/ref/SunnyUI.dll b/Bin/net5.0-windows/ref/SunnyUI.dll
index fc6c0fb4..18a95419 100644
Binary files a/Bin/net5.0-windows/ref/SunnyUI.dll and b/Bin/net5.0-windows/ref/SunnyUI.dll differ
diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll
index 43a09414..75caa640 100644
Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ
diff --git a/SunnyUI/Controls/UITextBox.cs b/SunnyUI/Controls/UITextBox.cs
index c8d0d398..42061f78 100644
--- a/SunnyUI/Controls/UITextBox.cs
+++ b/SunnyUI/Controls/UITextBox.cs
@@ -63,6 +63,8 @@ namespace Sunny.UI
             edit.Leave += Edit_Leave;
             edit.Validated += Edit_Validated;
             edit.Validating += Edit_Validating;
+            edit.GotFocus += Edit_GotFocus;
+            edit.LostFocus += Edit_LostFocus;
 
             edit.Invalidate();
             Controls.Add(edit);
@@ -84,12 +86,23 @@ namespace Sunny.UI
             TextAlignmentChange += UITextBox_TextAlignmentChange;
         }
 
+        private void Edit_LostFocus(object sender, EventArgs e)
+        {
+            LostFocus?.Invoke(this, e);
+        }
+
+        private void Edit_GotFocus(object sender, EventArgs e)
+        {
+            GotFocus?.Invoke(this, e);
+        }
+
         private void Edit_Validating(object sender, CancelEventArgs e)
         {
             Validating?.Invoke(this, e);
         }
 
-
+        public new EventHandler GotFocus;
+        public new EventHandler LostFocus;
         public new CancelEventHandler Validating;
         public new event EventHandler Validated;