diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
index f9ea01983..954da5586 100644
--- a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
@@ -406,6 +406,10 @@ void EntityGUI_SubShapeDlg::ResetStateOfDialog()
 //=================================================================================
 void EntityGUI_SubShapeDlg::SubShapeToggled()
 {
+  GroupPoints->PushButton2->setEnabled(!isAllSubShapes());
+  GroupPoints->PushButton3->setEnabled(!isAllSubShapes());
+  GroupPoints->PushButton4->setEnabled(!isAllSubShapes());
+
   activateSelection();
 }