diff --git a/common/eda_units.cpp b/common/eda_units.cpp
index 8d33dd2795..42812bdfb0 100644
--- a/common/eda_units.cpp
+++ b/common/eda_units.cpp
@@ -464,6 +464,13 @@ wxString EDA_UNIT_UTILS::UI::MessageTextFromValue( const EDA_IU_SCALE& aIuScale,
     }
 
     text.Printf( format, value );
+    removeTrailingZeros( text );
+
+    if( value != 0.0 && ( text == wxS( "0" ) || text == wxS( "-0" ) ) )
+    {
+        text.Printf( wxS( "%.10f" ), value );
+        removeTrailingZeros( text );
+    }
 
     if( aAddUnitsText )
         text += EDA_UNIT_UTILS::GetText( aUnits, aType );