diff --git a/src/blenderbim/blenderbim/bim/module/root/operator.py b/src/blenderbim/blenderbim/bim/module/root/operator.py
index 0a0936d6c9..310f3da352 100644
--- a/src/blenderbim/blenderbim/bim/module/root/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/root/operator.py
@@ -217,6 +217,7 @@ class UnlinkObject(bpy.types.Operator):
     bl_options = {"REGISTER", "UNDO"}
     obj: bpy.props.StringProperty(name="Object Name")
     should_delete: bpy.props.BoolProperty(name="Delete IFC Element", default=True)
+    skip_invoke: bpy.props.BoolProperty(default=False, options={"SKIP_SAVE"})
 
     def execute(self, context):
         return IfcStore.execute_ifc_operator(self, context)
@@ -286,6 +287,8 @@ class UnlinkObject(bpy.types.Operator):
         row.prop(self, "should_delete")
 
     def invoke(self, context, event):
+        if self.skip_invoke:
+            return self.execute(context)
         return context.window_manager.invoke_props_dialog(self)
 
 
diff --git a/src/blenderbim/blenderbim/bim/module/root/ui.py b/src/blenderbim/blenderbim/bim/module/root/ui.py
index a57bec2e40..80e44c6639 100644
--- a/src/blenderbim/blenderbim/bim/module/root/ui.py
+++ b/src/blenderbim/blenderbim/bim/module/root/ui.py
@@ -47,7 +47,9 @@ class BIM_PT_class(Panel):
             if not IfcClassData.data["has_entity"]:
                 row = self.layout.row(align=True)
                 row.label(text="IFC Element Not Found")
-                row.operator("bim.unlink_object", icon="UNLINKED", text="")
+                op = row.operator("bim.unlink_object", icon="UNLINKED", text="")
+                op.should_delete = False
+                op.skip_invoke = True
                 return
             if props.is_reassigning_class:
                 row = self.layout.row(align=True)