diff --git a/src/gui/set/random_pack_panel.cpp b/src/gui/set/random_pack_panel.cpp
index 6a92835a..6e4da64f 100644
--- a/src/gui/set/random_pack_panel.cpp
+++ b/src/gui/set/random_pack_panel.cpp
@@ -186,8 +186,12 @@ RandomPackPanel::~RandomPackPanel() {
 	storeSettings();
 }
 
+void RandomPackPanel::onBeforeChangeSet() {
+	if (set) {
+		storeSettings();
+	}
+}
 void RandomPackPanel::onChangeSet() {
-	storeSettings();
 	preview  ->setSet(set);
 	card_list->setSet(set);
 	totals   ->setGame(set->game);
diff --git a/src/gui/set/random_pack_panel.hpp b/src/gui/set/random_pack_panel.hpp
index a39cd93f..dc648619 100644
--- a/src/gui/set/random_pack_panel.hpp
+++ b/src/gui/set/random_pack_panel.hpp
@@ -28,6 +28,7 @@ class RandomPackPanel : public SetWindowPanel {
 	
 	// --------------------------------------------------- : UI
 	
+	virtual void onBeforeChangeSet();
 	virtual void onChangeSet();
 	
 	virtual void initUI   (wxToolBar* tb, wxMenuBar* mb);