diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp
index f50b3c7e1..4ec05884f 100644
--- a/src/qt_gui/main_window.cpp
+++ b/src/qt_gui/main_window.cpp
@@ -660,16 +660,16 @@ void MainWindow::StartGame() {
 
 void MainWindow::SearchGameTable(const QString& text) {
     m_game_info->m_games = m_game_info->m_games_backup;
-    m_game_grid_frame->PopulateGameGrid(m_game_info->m_games, false);
-    m_game_list_frame->PopulateGameList();
 
     if (isTableList) {
+        m_game_list_frame->PopulateGameList();
         for (int row = 0; row < m_game_list_frame->rowCount(); row++) {
             QString game_name = QString::fromStdString(m_game_info->m_games[row].name);
             bool match = (game_name.contains(text, Qt::CaseInsensitive)); // Check only in column 1
             m_game_list_frame->setRowHidden(row, !match);
         }
     } else {
+        m_game_grid_frame->PopulateGameGrid(m_game_info->m_games, false);
         QVector<GameInfo> filteredGames;
         for (const auto& gameInfo : m_game_info->m_games) {
             QString game_name = QString::fromStdString(gameInfo.name);