diff --git a/src/Avalonia.Input/FocusManager.cs b/src/Avalonia.Input/FocusManager.cs
index 102da6efc4..28fb26dca4 100644
--- a/src/Avalonia.Input/FocusManager.cs
+++ b/src/Avalonia.Input/FocusManager.cs
@@ -23,7 +23,7 @@ namespace Avalonia.Input
///
/// Initializes a new instance of the class.
///
- public FocusManager()
+ static FocusManager()
{
InputElement.PointerPressedEvent.AddClassHandler(
typeof(IInputElement),
@@ -174,7 +174,7 @@ namespace Avalonia.Input
///
/// The event sender.
/// The event args.
- private void OnPreviewPointerPressed(object sender, RoutedEventArgs e)
+ private static void OnPreviewPointerPressed(object sender, RoutedEventArgs e)
{
var ev = (PointerPressedEventArgs)e;
@@ -191,7 +191,7 @@ namespace Avalonia.Input
if (element != null)
{
- Focus(element, NavigationMethod.Pointer, ev.InputModifiers);
+ Instance?.Focus(element, NavigationMethod.Pointer, ev.InputModifiers);
}
}
}