diff --git a/common/widgets/unit_binder.cpp b/common/widgets/unit_binder.cpp
index 07f121a5f0..a84dff84b2 100644
--- a/common/widgets/unit_binder.cpp
+++ b/common/widgets/unit_binder.cpp
@@ -115,11 +115,16 @@ void UNIT_BINDER::SetDataType( EDA_DATA_TYPE aDataType )
 
 void UNIT_BINDER::onUnitsChanged( wxCommandEvent& aEvent )
 {
-    int temp = (int) GetValue();
+    if( m_units != EDA_UNITS::UNSCALED
+            && m_units != EDA_UNITS::DEGREES
+            && m_units != EDA_UNITS::PERCENT )
+    {
+        int temp = (int) GetValue();
 
-    SetUnits( m_frame->GetUserUnits() );
+        SetUnits( m_frame->GetUserUnits() );
 
-    SetValue( temp );
+        SetValue( temp );
+    }
 
     aEvent.Skip();
 }