diff --git a/src/Converters/StringConverters.cs b/src/Converters/StringConverters.cs
index 56c00fb4d..7d2821914 100644
--- a/src/Converters/StringConverters.cs
+++ b/src/Converters/StringConverters.cs
@@ -86,6 +86,6 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
             new FuncValueConverter<string, bool>(v => v != null && v.Trim().Length > 0);
 
         public static readonly FuncValueConverter<string, string> ToFriendlyUpstream =
-            new FuncValueConverter<string, string>(v => v != null ? v.Substring(13) : string.Empty);
+            new FuncValueConverter<string, string>(v => v is { Length: > 13 } ? v.Substring(13) : string.Empty);
     }
 }
diff --git a/src/Views/LauncherPage.axaml.cs b/src/Views/LauncherPage.axaml.cs
index a45d72e2e..cb2d38e0b 100644
--- a/src/Views/LauncherPage.axaml.cs
+++ b/src/Views/LauncherPage.axaml.cs
@@ -20,7 +20,7 @@ private void OnPopupSureByHotKey(object sender, RoutedEventArgs e)
             var children = this.GetLogicalDescendants();
             foreach (var child in children)
             {
-                if (child is TextBox { IsFocused: true } textBox)
+                if (child is EnhancedTextBox { IsFocused: true } textBox)
                 {
                     var fake = new KeyEventArgs()
                     {