diff --git a/eeschema/sch_pin.cpp b/eeschema/sch_pin.cpp
index eb1d45d349..6422455ccb 100644
--- a/eeschema/sch_pin.cpp
+++ b/eeschema/sch_pin.cpp
@@ -175,6 +175,7 @@ void SCH_PIN::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, MSG_PANEL_ITEMS& aList )
     aList.push_back( MSG_PANEL_ITEM( _( "Converted" ), msg ) );
 
     aList.push_back( MSG_PANEL_ITEM( _( "Name" ), GetName() ) );
+    msg = GetNumber().IsEmpty() ? wxT( "?" ) : GetNumber();
     aList.push_back( MSG_PANEL_ITEM( _( "Number" ), msg ) );
     aList.push_back( MSG_PANEL_ITEM( _( "Type" ), ElectricalPinTypeGetText( GetType() ) ) );