diff --git a/ULogViewer/Controls/LogStringPropertyDialog.axaml.cs b/ULogViewer/Controls/LogStringPropertyDialog.axaml.cs
index a2fff820..007adc69 100644
--- a/ULogViewer/Controls/LogStringPropertyDialog.axaml.cs
+++ b/ULogViewer/Controls/LogStringPropertyDialog.axaml.cs
@@ -204,7 +204,7 @@ public LogStringPropertyDialog()
 			this.SetValue<string>(LogPropertyDisplayNameProperty, LogPropertyNameConverter.Default.Convert(nameof(Log.Message)));
 			this.AddHandler(KeyDownEvent, (_, e) =>
 			{
-				if (e.Key == Key.F)
+				if (e.Key == Avalonia.Input.Key.F)
 				{
 					var modifier = Platform.IsMacOS ? KeyModifiers.Meta : KeyModifiers.Control;
 					if ((e.KeyModifiers & modifier) != 0)
diff --git a/ULogViewer/MainWindow.axaml.cs b/ULogViewer/MainWindow.axaml.cs
index 738af580..a5d63bbe 100644
--- a/ULogViewer/MainWindow.axaml.cs
+++ b/ULogViewer/MainWindow.axaml.cs
@@ -788,28 +788,28 @@ protected override void OnInitialDialogsClosed()
 
 
         // Called when key down.
-        protected override void OnKeyDown(KeyEventArgs e)
+        protected override void OnKeyDown(Avalonia.Input.KeyEventArgs e)
 		{
 			// handle key event for combo keys
 			if (!e.Handled && (e.KeyModifiers & KeyModifiers.Control) != 0)
 			{
 				switch (e.Key)
 				{
-					case Key.N:
+					case Avalonia.Input.Key.N:
 						if (!Platform.IsMacOS)
 						{
 							this.CreateMainWindow();
 							e.Handled = true;
 						}
 						break;
-					case Key.T:
+					case Avalonia.Input.Key.T:
 						if (!Platform.IsMacOS)
 						{
 							this.CreateSessionTabItem();
 							e.Handled = true;
 						}
 						break;
-					case Key.Tab:
+					case Avalonia.Input.Key.Tab:
 						if (this.tabItems.Count > 2)
 						{
 							var index = this.tabControl.SelectedIndex;
@@ -829,7 +829,7 @@ protected override void OnKeyDown(KeyEventArgs e)
 						}
 						e.Handled = true;
 						break;
-					case Key.W:
+					case Avalonia.Input.Key.W:
 						if (!Platform.IsMacOS)
 						{
 							this.CloseCurrentSessionTabItem();