diff --git a/nexus_constructor/add_component_window.py b/nexus_constructor/add_component_window.py
index 80fe65765..ad9285d5a 100644
--- a/nexus_constructor/add_component_window.py
+++ b/nexus_constructor/add_component_window.py
@@ -98,6 +98,7 @@ def __init__(
         self.setupUi()
         self.use_dialogs = use_dialogs
         self.setWindowModality(Qt.WindowModal)
+        self.setHidden(False)
         if self.initial_edit:
             self.ok_button.setText("Add group")
             self.cancel_button.setVisible(True)
@@ -137,6 +138,7 @@ def _cancel_new_group(self):
                 self._refresh_tree(group)
             else:
                 self._refresh_tree(self._group_to_edit_backup)
+            self.setHidden(True)
             self.close()
 
     def _cancel_edit_group(self):
@@ -626,7 +628,7 @@ def on_ok(self):
         if not self.initial_edit:
             self.signals.transformation_changed.emit()
         self.model.signals.group_edited.emit(index, True)
-        self.hide()
+        self.setHidden(True)
 
     def keyPressEvent(self, arg__1: QKeyEvent) -> None:
         if arg__1.key() == Qt.Key_Escape:
diff --git a/nexus_constructor/main_window.py b/nexus_constructor/main_window.py
index b26f18020..52c8f56ad 100644
--- a/nexus_constructor/main_window.py
+++ b/nexus_constructor/main_window.py
@@ -114,11 +114,7 @@ def show_add_component_dialog(self):
             return
         new_group = Group("", parent_node=selected_component)
         selected_component.children.append(new_group)
-        try:
-            if not self.add_component_window.isVisible():
-                self.show_add_component_window(new_group, new_group=True)
-        except (RuntimeError, AttributeError):
-            self.show_add_component_window(new_group, new_group=True)
+        self.show_add_component_window(new_group, new_group=True)
 
     def show_edit_component_dialog(self):
         try:
@@ -254,8 +250,9 @@ def show_add_component_window(self, group: Group, new_group: bool):
             nx_classes=self.nx_classes,
             tree_view_updater=self._update_model,
         )
-        self.main_grid_layout.addWidget(self.add_component_window)
-#        self.add_component_window.show()
+        if not self.add_component_window.isHidden():
+            self.main_grid_layout.addWidget(self.add_component_window)
+        self.add_component_window.setHidden(False)
 
     def _show_attributes_list_window(
         self, selected_object: Union[Group, FileWriterModule]