diff --git a/src/platform/qt/BattleChipView.cpp b/src/platform/qt/BattleChipView.cpp
index 1fdfe3679..a86cad1d1 100644
--- a/src/platform/qt/BattleChipView.cpp
+++ b/src/platform/qt/BattleChipView.cpp
@@ -46,6 +46,9 @@ BattleChipView::BattleChipView(std::shared_ptr<CoreController> controller, Windo
 		m_ui.inserted->setChecked(Qt::Unchecked);
 	});
 	connect(m_ui.chipName, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), m_ui.chipId, [this](int id) {
+		if (id < 0) {
+			return;
+		}
 		m_ui.chipId->setValue(m_model.chipNames().keys()[id]);
 	});
 
@@ -107,6 +110,7 @@ BattleChipView::~BattleChipView() {
 void BattleChipView::setFlavor(int flavor) {
 	m_controller->setBattleChipFlavor(flavor);
 	m_model.setFlavor(flavor);
+	m_ui.chipName->clear();
 	m_ui.chipName->addItems(m_model.chipNames().values());
 }