diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp
index 2c4d013ab7..8e697a148a 100644
--- a/eeschema/sch_painter.cpp
+++ b/eeschema/sch_painter.cpp
@@ -1421,6 +1421,9 @@ void SCH_PAINTER::draw( SCH_BUS_ENTRY_BASE *aEntry, int aLayer )
                                 m_schSettings.GetLayerColor( LAYER_BUS )
                                     : m_schSettings.GetLayerColor( LAYER_WIRE );
 
+    if( aEntry->GetState( BRIGHTENED ) )
+        color = m_schSettings.GetLayerColor( LAYER_BRIGHTENED );
+
     color = getOverlayColor( aEntry, color, false );
 
     m_gal->SetStrokeColor( color );
diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp
index b035db2f9b..b01b53815f 100644
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@@ -961,7 +961,9 @@ int SCH_SCREEN::GetNode( const wxPoint& aPosition, EDA_ITEMS& aList )
 {
     for( SCH_ITEM* item = m_drawList.begin(); item; item = item->Next() )
     {
-        if( item->Type() == SCH_LINE_T && item->HitTest( aPosition )
+        if( ( item->Type() == SCH_LINE_T || item->Type() == SCH_BUS_WIRE_ENTRY_T ||
+              item->Type() == SCH_BUS_BUS_ENTRY_T )
+            && item->HitTest( aPosition )
             && (item->GetLayer() == LAYER_BUS || item->GetLayer() == LAYER_WIRE) )
         {
             aList.push_back( item );