diff --git a/NEWS.md b/NEWS.md
index 592c479c7..6689e29b4 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -80,11 +80,13 @@ Many bugs have been fixed, and numerous features that were only partially implem
 * The random game selection traversed folders, i.e. a game could be selected inside a subdirectory and vice versa
 * Deleting a game from the metadata editor did not delete the game media files or the entry in the gamelist.xml file
 * SystemView didn't properly loop the systems if only two systems were available
-* When changing to the video view style from inside a gamelist, the view was not initialized
+* When changing to the video view style from inside a gamelist, the view was not completely initialized
 * Hidden files still showed up if they had a gamelist.xml entry
 * Fixed an annoying gamelist issue that caused the game images and data to be updated and rendered up to six times every time the list was scrolled
 * VRAM statistics overlay was somewhat broken and incorrectly displayed numbers in megabytes instead of mebibytes
 * Not all input events were logged when running with debug logging activated
+* Editing long text entries made the cursor jump outside the editing field
+* Long game names would sometimes not scroll in the gamelist view
 * On Unix, adding a hidden folder with a game in it crashed the application on startup
 * If the user tried to enter a blank game name in the metadata editor, the application would crash upon saving
 * The SliderComponent knob position was set incorrectly if the minimum value was not zero
diff --git a/es-core/src/components/TextListComponent.h b/es-core/src/components/TextListComponent.h
index db9b3ba6a..2bdda7090 100644
--- a/es-core/src/components/TextListComponent.h
+++ b/es-core/src/components/TextListComponent.h
@@ -336,8 +336,8 @@ void TextListComponent<T>::update(int deltaTime)
         mMarqueeOffset2 = 0;
 
         // If we're not scrolling and this object's text goes outside our size, marquee it!
-        const float textLength = mFont->sizeText(
-                mEntries.at(static_cast<unsigned int>(mCursor)).name).x();
+        const float textLength = mFont->sizeText(Utils::String::toUpper(
+                mEntries.at(static_cast<unsigned int>(mCursor)).name)).x();
         const float limit = mSize.x() - mHorizontalMargin * 2;
 
         if (textLength > limit) {