diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index 19089a378a..ccb0685ad3 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -747,6 +747,9 @@ int DRAWING_TOOL::DrawDimension( const TOOL_EVENT& aEvent )
                 dimension->SetStart( (wxPoint) cursorPos );
                 dimension->SetEnd( (wxPoint) cursorPos );
 
+                if( boardSettings.m_DimensionUnitsMode == DIM_UNITS_MODE::AUTOMATIC )
+                    dimension->SetUnits( m_frame->GetUserUnits(), false );
+
                 preview.Add( dimension );
 
                 m_controls->SetAutoPan( true );