diff --git a/pcbnew/footprint.cpp b/pcbnew/footprint.cpp
index 09ca202f26..3213031f76 100644
--- a/pcbnew/footprint.cpp
+++ b/pcbnew/footprint.cpp
@@ -2859,6 +2859,10 @@ static struct FOOTPRINT_DESC
         layer->SetChoices( fpLayers );
         propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Layer" ), layer );
 
+        propMgr.AddProperty( new PROPERTY<FOOTPRINT, double>( _HKI( "Orientation" ),
+                    &FOOTPRINT::SetOrientationDegrees, &FOOTPRINT::GetOrientationDegrees,
+                    PROPERTY_DISPLAY::PT_DEGREE ) );
+
         const wxString groupFootprint = _( "Footprint Properties" );
 
         propMgr.AddProperty( new PROPERTY<FOOTPRINT, wxString>( _HKI( "Reference" ),
@@ -2867,10 +2871,6 @@ static struct FOOTPRINT_DESC
         propMgr.AddProperty( new PROPERTY<FOOTPRINT, wxString>( _HKI( "Value" ),
                     &FOOTPRINT::SetValue, &FOOTPRINT::GetValueAsString ),
                     groupFootprint );
-        propMgr.AddProperty( new PROPERTY<FOOTPRINT, double>( _HKI( "Orientation" ),
-                    &FOOTPRINT::SetOrientationDegrees, &FOOTPRINT::GetOrientationDegrees,
-                    PROPERTY_DISPLAY::PT_DEGREE ),
-                    groupFootprint );
 
         propMgr.AddProperty( new PROPERTY<FOOTPRINT, wxString>( _HKI( "Library link" ),
                     NO_SETTER( FOOTPRINT, wxString ), &FOOTPRINT::GetFPIDAsString ),
diff --git a/pcbnew/pad.cpp b/pcbnew/pad.cpp
index 2e654aad6a..26a8f36a83 100644
--- a/pcbnew/pad.cpp
+++ b/pcbnew/pad.cpp
@@ -1726,6 +1726,10 @@ static struct PAD_DESC
         REGISTER_TYPE( PAD );
         propMgr.InheritsAfter( TYPE_HASH( PAD ), TYPE_HASH( BOARD_CONNECTED_ITEM ) );
 
+        propMgr.AddProperty( new PROPERTY<PAD, double>( _HKI( "Orientation" ),
+                    &PAD::SetOrientationDegrees, &PAD::GetOrientationDegrees,
+                    PROPERTY_DISPLAY::PT_DEGREE ) );
+
         const wxString groupPad = _( "Pad Properties" );
 
         auto padType = new PROPERTY_ENUM<PAD, PAD_ATTRIB>( _HKI( "Pad Type" ),
@@ -1744,9 +1748,6 @@ static struct PAD_DESC
                     NO_SETTER( PAD, wxString ), &PAD::GetPinFunction ), groupPad );
         propMgr.AddProperty( new PROPERTY<PAD, wxString>( _HKI( "Pin Type" ),
                     NO_SETTER( PAD, wxString ), &PAD::GetPinType ), groupPad);
-        propMgr.AddProperty( new PROPERTY<PAD, double>( _HKI( "Orientation" ),
-                    &PAD::SetOrientationDegrees, &PAD::GetOrientationDegrees,
-                    PROPERTY_DISPLAY::PT_DEGREE ), groupPad );
         propMgr.AddProperty( new PROPERTY<PAD, int>( _HKI( "Size X" ),
                     &PAD::SetSizeX, &PAD::GetSizeX,
                     PROPERTY_DISPLAY::PT_SIZE ), groupPad );