diff --git a/src/main/python/keyboard_container.py b/src/main/python/keyboard_container.py
index 1ba188c..8248384 100644
--- a/src/main/python/keyboard_container.py
+++ b/src/main/python/keyboard_container.py
@@ -48,6 +48,7 @@ class KeyboardContainer(QWidget):
 
         # delete old layer labels
         for label in self.layer_labels:
+            label.hide()
             label.deleteLater()
         self.layer_labels = []
 
diff --git a/src/main/python/layout_editor.py b/src/main/python/layout_editor.py
index 96480b5..0b2d185 100644
--- a/src/main/python/layout_editor.py
+++ b/src/main/python/layout_editor.py
@@ -22,7 +22,9 @@ class BooleanChoice:
         container.addWidget(self.widget_checkbox, row, 1)
 
     def delete(self):
+        self.widget_label.hide()
         self.widget_label.deleteLater()
+        self.widget_checkbox.hide()
         self.widget_checkbox.deleteLater()
 
     def pack(self):
@@ -57,7 +59,9 @@ class SelectChoice:
         container.addWidget(self.widget_options, row, 1)
 
     def delete(self):
+        self.widget_label.hide()
         self.widget_label.deleteLater()
+        self.widget_options.hide()
         self.widget_options.deleteLater()
 
     def pack(self):
diff --git a/src/main/python/tabbed_keycodes.py b/src/main/python/tabbed_keycodes.py
index cc2f1ba..4459030 100644
--- a/src/main/python/tabbed_keycodes.py
+++ b/src/main/python/tabbed_keycodes.py
@@ -66,5 +66,6 @@ class TabbedKeycodes(QTabWidget):
 
     def recreate_layer_keycode_buttons(self):
         for btn in self.layer_keycode_buttons:
+            btn.hide()
             btn.deleteLater()
         self.layer_keycode_buttons = self.create_buttons(self.layout_layers, KEYCODES_LAYERS)