diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py
index 077cc6016..1ea8a526c 100644
--- a/src/Mod/Arch/ArchComponent.py
+++ b/src/Mod/Arch/ArchComponent.py
@@ -240,7 +240,7 @@ class ComponentTaskPanel:
         if it:
             mod = None
             for a in self.attribs:
-                if it == getattr(self,"tree"+a):
+                if it.text(0) == getattr(self,"tree"+a).text(0):
                     mod = a
             for o in FreeCADGui.Selection.getSelection():
                 addToComponent(self.obj,o,mod)
diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py
index 8e3506e64..e291e2e1b 100644
--- a/src/Mod/Draft/Draft.py
+++ b/src/Mod/Draft/Draft.py
@@ -592,7 +592,7 @@ def getMovableChildren(objectslist,recursive=False):
             children = obj.OutList
             if  hasattr(obj,"Proxy"):
                 if obj.Proxy:
-                    if hasattr(obj.Proxy,"getSiblings"):
+                    if hasattr(obj.Proxy,"getSiblings") and not(getType(obj) in ["Window"]):
                         children.extend(obj.Proxy.getSiblings(obj))
             for child in children:
                 if hasattr(child,"MoveWithHost"):