diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index 5a768f4bc5..f02c862ff5 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -1352,6 +1352,10 @@ void SCH_EDIT_FRAME::RefreshOperatingPointDisplay()
             {
                 SIM_MODEL& model = simLibMgr.CreateModel( &GetCurrentSheet(), *symbol ).model;
 
+                SPICE_ITEM spiceItem;
+                spiceItem.refName = ref;
+                ref = model.SpiceGenerator().ItemName( spiceItem );
+
                 for( const auto& modelPin : model.GetPins() )
                 {
                     SCH_PIN* symbolPin = symbol->GetPin( modelPin.get().symbolPinNumber );
diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp
index 129d89e7b0..96ba97db8b 100644
--- a/eeschema/sch_painter.cpp
+++ b/eeschema/sch_painter.cpp
@@ -1357,7 +1357,7 @@ void SCH_PAINTER::draw( const LIB_PIN *aPin, int aLayer, bool aDimmed )
         int             textOffset = KiROUND( textSize * 0.22 );
         TEXT_ATTRIBUTES attrs;
 
-        if( len > KiROUND( textSize * 1.8 ) )
+        if( len > textSize )
         {
             if( dir.x == 0 )
             {