diff --git a/src/Mod/Assembly/JointObject.py b/src/Mod/Assembly/JointObject.py
index 6a225b0889..968ed334db 100644
--- a/src/Mod/Assembly/JointObject.py
+++ b/src/Mod/Assembly/JointObject.py
@@ -729,6 +729,10 @@ class ViewProviderJoint:
         return None
 
     def doubleClicked(self, vobj):
+        task = Gui.Control.activeTaskDialog()
+        if task:
+            task.reject()
+
         assembly = vobj.Object.InList[0]
         if UtilsAssembly.activeAssembly() != assembly:
             Gui.ActiveDocument.setEdit(assembly)
@@ -851,6 +855,12 @@ class MakeJointSelGate:
         full_element_name = full_obj_name + "." + element_name
         selected_object = UtilsAssembly.getObject(full_element_name)
 
+        if not (
+            selected_object.isDerivedFrom("Part::Feature")
+            or selected_object.isDerivedFrom("App::Part")
+        ):
+            return False
+
         part_containing_selected_object = UtilsAssembly.getContainingPart(
             full_element_name, selected_object, self.assembly
         )