diff --git a/eeschema/cmp_tree_model_adapter_base.cpp b/eeschema/cmp_tree_model_adapter_base.cpp
index 2d59d15921..3e4293f501 100644
--- a/eeschema/cmp_tree_model_adapter_base.cpp
+++ b/eeschema/cmp_tree_model_adapter_base.cpp
@@ -189,10 +189,6 @@ void CMP_TREE_MODEL_ADAPTER_BASE::AttachTo( wxDataViewCtrl* aDataViewCtrl )
                 ColWidth( m_tree, 0, part_head ) );
     m_col_desc = aDataViewCtrl->AppendTextColumn( desc_head, 1, wxDATAVIEW_CELL_INERT,
                 ColWidth( m_tree, 1, desc_head ) );
-
-    // Enabling sort order breaks node selection on Windows, so unfortunately the list
-    // stays sorted in inverted lexical order. On Linux it does not change anything.
-    m_col_part->SetSortOrder( 0 );
 }
 
 
diff --git a/eeschema/widgets/component_tree.cpp b/eeschema/widgets/component_tree.cpp
index aca974d407..54524075cf 100644
--- a/eeschema/widgets/component_tree.cpp
+++ b/eeschema/widgets/component_tree.cpp
@@ -253,19 +253,11 @@ void COMPONENT_TREE::onQueryCharHook( wxKeyEvent& aKeyStroke )
 
     switch( aKeyStroke.GetKeyCode() )
     {
-#ifndef __WINDOWS__
     case WXK_UP:
-#else
-    case WXK_DOWN:
-#endif
         selectIfValid( GetPrevItem( *m_tree_ctrl, sel ) );
         break;
 
-#ifndef __WINDOWS__
     case WXK_DOWN:
-#else
-    case WXK_UP:
-#endif
         selectIfValid( GetNextItem( *m_tree_ctrl, sel ) );
         break;