diff --git a/pcbnew/widgets/pcb_properties_panel.cpp b/pcbnew/widgets/pcb_properties_panel.cpp
index c9c11a0630..dae038f77c 100644
--- a/pcbnew/widgets/pcb_properties_panel.cpp
+++ b/pcbnew/widgets/pcb_properties_panel.cpp
@@ -30,8 +30,11 @@
 #include <board_connected_item.h>
 #include <properties/pg_properties.h>
 #include <pcb_shape.h>
+#include <fp_shape.h>
 #include <pcb_text.h>
+#include <fp_text.h>
 #include <pcb_track.h>
+#include <pad.h>
 #include <settings/color_settings.h>
 #include <string_utils.h>
 
@@ -189,6 +192,20 @@ void PCB_PROPERTIES_PANEL::valueChanging( wxPropertyGridEvent& aEvent )
 }
 
 
+void setLocalCoord( BOARD_ITEM* aItem )
+{
+    // TODO: we really need to get rid of this local/draw coords stuff (and make FP_* items the
+    //       same as PCB_* items), but for now, it is what it is.
+
+    if( FP_SHAPE* shape = dynamic_cast<FP_SHAPE*>( aItem ) )
+        shape->SetLocalCoord();
+    else if( FP_TEXT* text = dynamic_cast<FP_TEXT*>( aItem ) )
+        text->SetLocalCoord();
+    else if( PAD* pad = dynamic_cast<PAD*>( aItem ) )
+        pad->SetLocalCoord();
+}
+
+
 void PCB_PROPERTIES_PANEL::valueChanged( wxPropertyGridEvent& aEvent )
 {
     PCB_SELECTION_TOOL* selectionTool = m_frame->GetToolManager()->GetTool<PCB_SELECTION_TOOL>();
@@ -205,6 +222,7 @@ void PCB_PROPERTIES_PANEL::valueChanged( wxPropertyGridEvent& aEvent )
         BOARD_ITEM* item = static_cast<BOARD_ITEM*>( edaItem );
         changes.Modify( item );
         item->Set( property, newValue );
+        setLocalCoord( item );
     }
 
     changes.Push( _( "Change property" ) );