diff --git a/es-app/src/views/gamelist/VideoGameListView.h b/es-app/src/views/gamelist/VideoGameListView.h
index 3516d8477..170a0dbbd 100644
--- a/es-app/src/views/gamelist/VideoGameListView.h
+++ b/es-app/src/views/gamelist/VideoGameListView.h
@@ -20,8 +20,9 @@ class VideoComponent;
 class VideoGameListView : public BasicGameListView
 {
 public:
-    VideoGameListView(Window* window, FileData* root);
-    virtual ~VideoGameListView();
+    VideoGameListView(Window *window, FileData *root);
+
+    virtual ~VideoGameListView() noexcept;
 
     virtual void onShow() override;
     virtual void onThemeChanged(const std::shared_ptr<ThemeData>& theme) override;
diff --git a/es-core/src/components/BadgesComponent.cpp b/es-core/src/components/BadgesComponent.cpp
index 1a5b5f341..b0f948215 100644
--- a/es-core/src/components/BadgesComponent.cpp
+++ b/es-core/src/components/BadgesComponent.cpp
@@ -18,6 +18,7 @@ const std::vector<std::string> BadgesComponent::mSlots = {SLOT_FAVORITE, SLOT_CO
                                                           SLOT_ALTERNATIVE_EMULATOR};
 std::map<std::string, std::string> BadgesComponent::mBadgeIcons = std::map<std::string, std::string>();
 std::map<std::string, ImageComponent> BadgesComponent::mImageComponents = std::map<std::string, ImageComponent>();
+std::vector<BadgesComponent *> BadgesComponent::mInstances = {};
 
 BadgesComponent::BadgesComponent(Window *window)
         : FlexboxComponent(window) {
@@ -48,12 +49,19 @@ BadgesComponent::BadgesComponent(Window *window)
         mImageAltEmu.setImage(mBadgeIcons[SLOT_ALTERNATIVE_EMULATOR], false, true);
         mImageComponents.insert({SLOT_ALTERNATIVE_EMULATOR, mImageAltEmu});
     }
+
+    mInstances.push_back(this);
 }
 
-BadgesComponent::~BadgesComponent() {
-    mChildren.clear();
-    mBadgeIcons.clear();
-    mImageComponents.clear();
+BadgesComponent::~BadgesComponent() noexcept {
+    for (GuiComponent *c: mChildren)
+        c->clearChildren();
+    clearChildren();
+    mInstances.erase(std::remove(mInstances.begin(), mInstances.end(), this), mInstances.end());
+    if (mInstances.empty()) {
+        mBadgeIcons.clear();
+        mImageComponents.clear();
+    }
 }
 
 
diff --git a/es-core/src/components/BadgesComponent.h b/es-core/src/components/BadgesComponent.h
index 7da63e447..4a54fa323 100644
--- a/es-core/src/components/BadgesComponent.h
+++ b/es-core/src/components/BadgesComponent.h
@@ -28,7 +28,6 @@ class BadgesComponent : public FlexboxComponent
 {
 public:
     BadgesComponent(Window *window);
-
     ~BadgesComponent() noexcept;
 
     std::string getValue() const override;
@@ -46,6 +45,7 @@ private:
     static const std::vector<std::string> mSlots;
     static std::map<std::string, std::string> mBadgeIcons;
     static std::map<std::string, ImageComponent> mImageComponents;
+    static std::vector<BadgesComponent *> mInstances;
 };
 
 #endif // ES_APP_COMPONENTS_BADGES_COMPONENT_H