diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index 2fbef1de2f..4860b4b631 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -742,23 +742,11 @@ int EDIT_TOOL::Properties( const TOOL_EVENT& aEvent )
         // Display properties dialog
         BOARD_ITEM* item = static_cast<BOARD_ITEM*>( selection.Front() );
 
-        // Pads on a locked footprint can be selected but not edited
-        if( item->Type() == PCB_PAD_T && item->GetParent() &&
-                ( static_cast<D_PAD*>( item )->GetParent()->IsLocked() ||
-                  static_cast<D_PAD*>( item )->GetParent()->PadsLocked() ) )
-        {
-            m_statusPopup->SetText( _( "Locked items cannot be edited" ) );
-            m_statusPopup->PopupFor( 2000 );
-            m_statusPopup->Move( wxGetMousePosition() + wxPoint( 20, 20 ) );
-        }
-        else
-        {
-            // Do not handle undo buffer, it is done by the properties dialogs
-            editFrame->OnEditItemRequest( item );
+        // Do not handle undo buffer, it is done by the properties dialogs
+        editFrame->OnEditItemRequest( item );
 
-            // Notify other tools of the changes
-            m_toolMgr->ProcessEvent( EVENTS::SelectedItemsModified );
-        }
+        // Notify other tools of the changes
+        m_toolMgr->ProcessEvent( EVENTS::SelectedItemsModified );
     }
     else if( selection.Size() == 0 && getView()->IsLayerVisible( LAYER_WORKSHEET ) )
     {