diff --git a/src/osdep/amiberry.cpp b/src/osdep/amiberry.cpp
index 7f9f41e83..9e2b24597 100644
--- a/src/osdep/amiberry.cpp
+++ b/src/osdep/amiberry.cpp
@@ -4907,6 +4907,7 @@ std::vector<std::string> get_cd_drives()
 	pclose(fp);
 	return results;
 }
+
 void target_setdefaultstatefilename(const TCHAR* name)
 {
 	TCHAR path[MAX_DPATH];
diff --git a/src/osdep/gui/PanelHD.cpp b/src/osdep/gui/PanelHD.cpp
index e9853ba5a..f1bd09134 100644
--- a/src/osdep/gui/PanelHD.cpp
+++ b/src/osdep/gui/PanelHD.cpp
@@ -375,7 +375,8 @@ class CDFileActionListener : public gcn::ActionListener
 						bIgnoreListChange = true;
 						cboCDFile->setSelected(0);
 						bIgnoreListChange = false;
-						SetLastActiveConfig(element.c_str());
+						if (!last_loaded_config[0])
+							set_last_active_config(element.c_str());
 					}
 				}
 			}
diff --git a/src/osdep/gui/PanelQuickstart.cpp b/src/osdep/gui/PanelQuickstart.cpp
index 06b871bc1..8aecf93d7 100644
--- a/src/osdep/gui/PanelQuickstart.cpp
+++ b/src/osdep/gui/PanelQuickstart.cpp
@@ -423,7 +423,8 @@ class QSCDActionListener : public gcn::ActionListener
 						bIgnoreListChange = true;
 						cboCDFile->setSelected(0);
 						bIgnoreListChange = false;
-						SetLastActiveConfig(element.c_str());
+						if (!last_loaded_config[0])
+							set_last_active_config(element.c_str());
 					}
 				}
 			}