diff --git a/pcbnew/dialogs/dialog_update_pcb.cpp b/pcbnew/dialogs/dialog_update_pcb.cpp
index 56d4024912..3a399f0cdd 100644
--- a/pcbnew/dialogs/dialog_update_pcb.cpp
+++ b/pcbnew/dialogs/dialog_update_pcb.cpp
@@ -110,11 +110,14 @@ void DIALOG_UPDATE_PCB::PerformUpdate( bool aDryRun )
     {
         m_frame->SpreadFootprints( &newFootprints, false, false );
 
-        BOOST_FOREACH( MODULE* footprint, newFootprints )
+        if( !newFootprints.empty() )
         {
-            toolManager->RunAction( COMMON_ACTIONS::selectItem, true, footprint );
+            BOOST_FOREACH( MODULE* footprint, newFootprints )
+            {
+                toolManager->RunAction( COMMON_ACTIONS::selectItem, true, footprint );
+            }
+            toolManager->InvokeTool( "pcbnew.InteractiveEdit" );
         }
-        toolManager->InvokeTool( "pcbnew.InteractiveEdit" );
     }