diff --git a/pcbnew/cross-probing.cpp b/pcbnew/cross-probing.cpp
index 5f1ba2a3d6..9ff6cba1fb 100644
--- a/pcbnew/cross-probing.cpp
+++ b/pcbnew/cross-probing.cpp
@@ -167,8 +167,12 @@ void PCB_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
 
     if( module )
     {
-        m_toolManager->RunAction( PCB_ACTIONS::highlightItem, true, (void*) module );
         bbox = module->GetBoundingBox();
+
+        if( pad )
+            m_toolManager->RunAction( PCB_ACTIONS::highlightItem, true, (void*) pad );
+        else
+            m_toolManager->RunAction( PCB_ACTIONS::highlightItem, true, (void*) module );
     }
     else if( netcode > 0 )
     {