diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp
index 1c6170a935..d45c2623d9 100644
--- a/src/Mod/PartDesign/Gui/Command.cpp
+++ b/src/Mod/PartDesign/Gui/Command.cpp
@@ -2460,7 +2460,7 @@ public:
 
     bool isActive() override
     {
-        return hasActiveDocument();
+         return (hasActiveDocument() && !Gui::Control().activeDialog());
     }
 };
 
@@ -2495,7 +2495,7 @@ public:
 
     bool isActive() override
     {
-        return hasActiveDocument();
+         return (hasActiveDocument() && !Gui::Control().activeDialog());
     }
 };