diff --git a/src/Mod/Assembly/UtilsAssembly.py b/src/Mod/Assembly/UtilsAssembly.py
index ca26472864..f6defc2738 100644
--- a/src/Mod/Assembly/UtilsAssembly.py
+++ b/src/Mod/Assembly/UtilsAssembly.py
@@ -43,6 +43,10 @@ def activePartOrAssembly():
 
     if doc is None or doc.ActiveView is None:
         return None
+    activeAssembly = doc.ActiveView.getActiveObject("assembly")
+
+    if activeAssembly:
+        return activeAssembly
 
     return doc.ActiveView.getActiveObject("part")