diff --git a/.editorconfig b/.editorconfig
index b7a03207a4..5f08d1e940 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -132,6 +132,9 @@ csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
 csharp_space_between_square_brackets = false
 
+# Wrapping preferences
+csharp_wrap_before_ternary_opsigns = false
+
 # Xaml files
 [*.xaml]
 indent_size = 4
diff --git a/src/Avalonia.Controls/TreeView.cs b/src/Avalonia.Controls/TreeView.cs
index 6aa45d9dc1..19e09b4339 100644
--- a/src/Avalonia.Controls/TreeView.cs
+++ b/src/Avalonia.Controls/TreeView.cs
@@ -340,9 +340,9 @@ namespace Avalonia.Controls
             {
                 if (!this.IsVisualAncestorOf(element))
                 {
-                    IControl result = _selectedItem != null
-                        ? ItemContainerGenerator.Index.ContainerFromItem(_selectedItem)
-                        : ItemContainerGenerator.ContainerFromIndex(0);
+                    IControl result = _selectedItem != null ?
+                        ItemContainerGenerator.Index.ContainerFromItem(_selectedItem) :
+                        ItemContainerGenerator.ContainerFromIndex(0);
                     return (true, result);
                 }
 
@@ -426,9 +426,9 @@ namespace Avalonia.Controls
                     if (index > 0)
                     {
                         var previous = (TreeViewItem)parentGenerator.ContainerFromIndex(index - 1);
-                        result = previous.IsExpanded
-                            ? (TreeViewItem)previous.ItemContainerGenerator.ContainerFromIndex(previous.ItemCount - 1)
-                            : previous;
+                        result = previous.IsExpanded ?
+                            (TreeViewItem)previous.ItemContainerGenerator.ContainerFromIndex(previous.ItemCount - 1) :
+                            previous;
                     }
                     else
                     {