diff --git a/es-app/src/FileFilterIndex.cpp b/es-app/src/FileFilterIndex.cpp
index b7a0bb5fa..688ee644d 100644
--- a/es-app/src/FileFilterIndex.cpp
+++ b/es-app/src/FileFilterIndex.cpp
@@ -409,11 +409,12 @@ bool FileFilterIndex::showFile(FileData* game)
     // in [] from the search string.
     if (mTextFilter != "" && mTextRemoveSystem &&
         !(Utils::String::toUpper(game->getName().substr(0, game->getName().find_last_of("[")))
-              .find(mTextFilter) != std::string::npos)) {
+              .find(Utils::String::toUpper(mTextFilter)) != std::string::npos)) {
         return false;
     }
     else if (mTextFilter != "" &&
-             !(Utils::String::toUpper(game->getName()).find(mTextFilter) != std::string::npos)) {
+             !(Utils::String::toUpper(game->getName()).find(Utils::String::toUpper(mTextFilter)) !=
+               std::string::npos)) {
         return false;
     }
 
diff --git a/es-app/src/guis/GuiGamelistFilter.cpp b/es-app/src/guis/GuiGamelistFilter.cpp
index 7721e38bf..67fed267b 100644
--- a/es-app/src/guis/GuiGamelistFilter.cpp
+++ b/es-app/src/guis/GuiGamelistFilter.cpp
@@ -124,8 +124,8 @@ void GuiGamelistFilter::addFiltersToMenu()
 
     // Callback function.
     auto updateVal = [this](const std::string& newVal) {
-        mTextFilterField->setValue(Utils::String::toUpper(newVal));
-        mFilterIndex->setTextFilter(Utils::String::toUpper(newVal));
+        mTextFilterField->setValue(Utils::String::trim(newVal));
+        mFilterIndex->setTextFilter(Utils::String::trim(newVal));
     };
 
     if (Settings::getInstance()->getBool("VirtualKeyboard")) {