diff --git a/gazebo/gui/building/BuildingMaker.cc b/gazebo/gui/building/BuildingMaker.cc
index 5e225532fb..21de7ec310 100644
--- a/gazebo/gui/building/BuildingMaker.cc
+++ b/gazebo/gui/building/BuildingMaker.cc
@@ -228,8 +228,10 @@ void BuildingMaker::DetachFromParent(const std::string &_child)
     parentManip.second.erase(std::remove(parentManip.second.begin(),
         parentManip.second.end(), _child), parentManip.second.end());
 
-    if (parentManip.second.empty())
+    if (parentManip.second.empty()) {
       this->DetachAllChildren(parentManip.first);
+      break;
+    }
   }
 }