diff --git a/swing/src/main/java/info/openrocket/swing/gui/widgets/GroupableAndSearchableComboBox.java b/swing/src/main/java/info/openrocket/swing/gui/widgets/GroupableAndSearchableComboBox.java
index 3b27c3c33..7fef1cf9a 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/widgets/GroupableAndSearchableComboBox.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/widgets/GroupableAndSearchableComboBox.java
@@ -334,7 +334,7 @@ public class GroupableAndSearchableComboBox<G extends Group, T extends Groupable
 		});
 	}
 
-	private void hidePopups() {
+	public void hidePopups() {
 		hideGroupsPopup();
 		hideSearchPopup();
 	}
diff --git a/swing/src/main/java/info/openrocket/swing/gui/widgets/MaterialComboBox.java b/swing/src/main/java/info/openrocket/swing/gui/widgets/MaterialComboBox.java
index cd2a733c3..2d31ccc3b 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/widgets/MaterialComboBox.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/widgets/MaterialComboBox.java
@@ -44,7 +44,7 @@ public abstract class MaterialComboBox extends JComboBox<Material> {
 			});
 		});
 
-		return new GroupableAndSearchableComboBox<>(mm,
+		GroupableAndSearchableComboBox<MaterialGroup, Material> comboBox = new GroupableAndSearchableComboBox<>(mm,
 				trans.get("MaterialPanel.MaterialComboBox.placeholder"), customMaterialButton, editMaterialsButton) {
 			@Override
 			public String getDisplayString(Material item) {
@@ -55,5 +55,15 @@ public abstract class MaterialComboBox extends JComboBox<Material> {
 				return baseText;
 			}
 		};
+
+		// Ensure combobox is hidden when buttons are clicked
+		customMaterialButton.addActionListener(e -> {
+			comboBox.hidePopups();
+		});
+		editMaterialsButton.addActionListener(e -> {
+			comboBox.hidePopups();
+		});
+
+		return comboBox;
 	}
 }