diff --git a/CHANGELOG.md b/CHANGELOG.md
index e08e79eda..233a5e019 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - #1437: Norwegian translation improvements
 ### Fixed
 - #1447: Exception occurs when resetting layout
+- #1439: Searching in hosts tree loses first keystroke
 - #1428: Fixed a rare error when checking for FIPS
 - #1426: Tabbing is reversed in config window
 - #1425: Connections didn't always respect the Panel property
diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
index ad4697396..137f9d53e 100644
--- a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
+++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
@@ -338,8 +338,8 @@ namespace mRemoteNG.UI.Window
             try
             {
                 if (!char.IsLetterOrDigit(e.KeyChar)) return;
-                txtSearch.Text = e.KeyChar.ToString();
                 txtSearch.Focus();
+                txtSearch.Text = e.KeyChar.ToString();
                 txtSearch.SelectionStart = txtSearch.TextLength;
             }
             catch (Exception ex)