diff --git a/es-app/src/views/gamelist/GridGameListView.cpp b/es-app/src/views/gamelist/GridGameListView.cpp
index 4d979a502..9314905dd 100644
--- a/es-app/src/views/gamelist/GridGameListView.cpp
+++ b/es-app/src/views/gamelist/GridGameListView.cpp
@@ -51,9 +51,17 @@ bool GridGameListView::input(InputConfig* config, Input input)
 void GridGameListView::populateList(const std::vector<FileData*>& files)
 {
 	mGrid.clear();
-	for(auto it = files.cbegin(); it != files.cend(); it++)
+	mHeaderText.setText(mRoot->getSystem()->getFullName());
+	if (files.size() > 0)
 	{
-		mGrid.add((*it)->getName(), (*it)->getThumbnailPath(), *it);
+		for (auto it = files.cbegin(); it != files.cend(); it++)
+		{
+			mGrid.add((*it)->getName(), (*it)->getThumbnailPath(), *it);
+		}
+	}
+	else
+	{
+		addPlaceholder();
 	}
 }