diff --git a/es-app/src/views/GamelistView.cpp b/es-app/src/views/GamelistView.cpp
index 46ce49260..aa39b1ff2 100644
--- a/es-app/src/views/GamelistView.cpp
+++ b/es-app/src/views/GamelistView.cpp
@@ -999,7 +999,7 @@ void GamelistView::updateView(const CursorState& state)
                  file->getPath() == file->getSystem()->getName()) &&
                 (metadata == "systemName" || metadata == "systemFullname" ||
                  metadata == "sourceSystemName" || metadata == "sourceSystemFullname")) {
-                text->setValue("");
+                text->setValue(text->getDefaultValue());
                 continue;
             }
 
diff --git a/es-core/src/components/TextComponent.cpp b/es-core/src/components/TextComponent.cpp
index 0ef5bb94a..715a70045 100644
--- a/es-core/src/components/TextComponent.cpp
+++ b/es-core/src/components/TextComponent.cpp
@@ -691,7 +691,10 @@ void TextComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
                 mThemeMetadata = type;
                 if (elem->has("defaultValue")) {
                     if (mThemeMetadata == "developer" || mThemeMetadata == "publisher" ||
-                        mThemeMetadata == "genre" || mThemeMetadata == "players") {
+                        mThemeMetadata == "genre" || mThemeMetadata == "players" ||
+                        mThemeMetadata == "systemName" || mThemeMetadata == "systemFullname" ||
+                        mThemeMetadata == "sourceSystemName" ||
+                        mThemeMetadata == "sourceSystemFullname") {
                         const std::string& defaultValue {elem->get<std::string>("defaultValue")};
                         if (defaultValue == ":space:")
                             mDefaultValue = " ";
diff --git a/es-core/src/components/TextComponent.h b/es-core/src/components/TextComponent.h
index d21d16a31..837c8c92e 100644
--- a/es-core/src/components/TextComponent.h
+++ b/es-core/src/components/TextComponent.h
@@ -62,6 +62,8 @@ public:
     std::string getHiddenValue() const override { return mHiddenText; }
     void setHiddenValue(const std::string& value) override { setHiddenText(value); }
 
+    const std::string getDefaultValue() const { return mDefaultValue; }
+
     float const getOpacity() const override
     {
         return static_cast<float>((mColor & 0x000000FF) / 255.0f);