diff --git a/app/Platform/Actions/ComputeGameSortTitleAction.php b/app/Platform/Actions/ComputeGameSortTitleAction.php
index 91e6968cc4..cbfe8cbdea 100644
--- a/app/Platform/Actions/ComputeGameSortTitleAction.php
+++ b/app/Platform/Actions/ComputeGameSortTitleAction.php
@@ -32,7 +32,7 @@ private function padNumbers(string $title): string
         return preg_replace_callback(
             // Match numbers not directly attached to letters.
             // In other words, don't convert "Mega Man X4" to "Mega Man X00004".
-            '/(?<=\b|\s)(\d+)(?=\b|\s)/',
+            '/(?<![a-zA-Z])(\d+)(?![a-zA-Z])/',
             function ($matches) {
                 return str_pad($matches[0], 5, '0', STR_PAD_LEFT);
             },
@@ -58,11 +58,18 @@ private function replaceRomanNumerals(string $title): string
          * non-apostrophe punctuation (or whitespace then punctuation) like :, -, &, or (.
          */
         $title = preg_replace_callback(
-            '/\b([IVX]+)(?=(?:$|\s*[:\-&\(\)]|\s*$))/i',
+            '/\b([IVX]+)(?:$|\s*[:&(]|\s*$|-\d+)/i',
             function ($matches) use ($romanNumerals) {
-                $roman = $matches[1];
+                $roman = strtoupper($matches[1]);
                 if (isset($romanNumerals[$roman])) {
-                    return sprintf('%02d', $romanNumerals[$roman]);
+                    $numericValue = sprintf('%05d', $romanNumerals[$roman]);
+
+                    // If there's a hyphen and number after the Roman numeral, pad that number too.
+                    if ($matches[0] && preg_match('/-(\d+)$/', $matches[0], $suffixMatch)) {
+                        $numericValue .= '-' . sprintf('%05d', $suffixMatch[1]);
+                    }
+
+                    return $numericValue;
                 }
 
                 return $roman;
@@ -82,12 +89,12 @@ function ($matches) use ($romanNumerals) {
      */
     private function removeArticles(string $title): string
     {
-    // Remove articles at the start of the title
-        if (preg_match('/^\s*(a|an|the)\b\s*(.*)$/i', $title, $matches)) {
+        // Remove articles at the start of the title, but not if they're part of a hyphenated word.
+        if (preg_match('/^\s*(a|an|the)\b(?!-)\s*(.*)$/i', $title, $matches)) {
             $title = $matches[2];
         }
 
-        // Remove articles at the end after a comma
+        // Remove articles at the end after a comma.
         if (preg_match('/^(.+),\s*(a|an|the)\b(.*)$/i', $title, $matches)) {
             // Combine the main title and any trailing text.
             $title = trim($matches[1] . $matches[3]);
diff --git a/database/factories/GameFactory.php b/database/factories/GameFactory.php
index 06bd711cbd..72fc85e087 100644
--- a/database/factories/GameFactory.php
+++ b/database/factories/GameFactory.php
@@ -21,13 +21,30 @@ class GameFactory extends Factory
     public function definition(): array
     {
         $title = ucwords(fake()->words(2, true));
-        $sortTitle = (new ComputeGameSortTitleAction())->execute($title);
 
         return [
             'Title' => $title,
-            'sort_title' => $sortTitle,
+            'sort_title' => null,
             'ConsoleID' => 0,
             'ImageIcon' => '/Images/000001.png',
         ];
     }
+
+    public function configure(): static
+    {
+        /**
+         * Derive the sort_title from both autogenerated and manually-provided titles.
+         * If the factory receives a custom sort_title, do nothing.
+         */
+
+        return $this->afterMaking(function (Game $game) {
+            if ($game->sort_title === null) {
+                $game->sort_title = (new ComputeGameSortTitleAction())->execute($game->title);
+            }
+        })->afterCreating(function (Game $game) {
+            if ($game->sort_title === null) {
+                $game->sort_title = (new ComputeGameSortTitleAction())->execute($game->title);
+            }
+        });
+    }
 }
diff --git a/tests/Feature/Platform/Action/ComputeGameSortTitleActionTest.php b/tests/Feature/Platform/Action/ComputeGameSortTitleActionTest.php
index aca7abb468..a334ecb0fa 100644
--- a/tests/Feature/Platform/Action/ComputeGameSortTitleActionTest.php
+++ b/tests/Feature/Platform/Action/ComputeGameSortTitleActionTest.php
@@ -34,12 +34,14 @@ public static function titleProvider(): array
             '007: Agent Under Fire' => ['007: Agent Under Fire', '00007 agent under fire'],
             '101 Dalmatians' => ['101 Dalmatians', '00101 dalmatians'],
             '50 Cent: Blood on the Sand' => ['50 Cent: Blood on the Sand', '00050 cent blood on the sand'],
+            'A-Mazing Tater' => ['A-Mazing Tater', 'a-mazing tater'],
             'A Series of Unfortunate Events' => ['A Series of Unfortunate Events', 'series of unfortunate events'],
             'American Tale, An' => ['American Tale, An', 'american tale'],
             'An Unexpected Journey' => ['An Unexpected Journey', 'unexpected journey'],
             'Bravely Défault II' => ['Bravely Défault II', 'bravely default 00002'],
             'Final Fantasy IV' => ['Final Fantasy IV', 'final fantasy 00004'],
             'Final Fantasy X' => ['Final Fantasy X', 'final fantasy 00010'],
+            'Final Fantasy X-2' => ['Final Fantasy X-2', 'final fantasy 00010-00002'],
             'Formula 1-97' => ['Formula 1-97', 'formula 00001-00097'],
             'GIVX' => ['GIVX', 'givx'],
             'Grand Day Out, A' => ['Grand Day Out, A', 'grand day out'],
@@ -65,6 +67,7 @@ public static function titleProvider(): array
             'Super Mario Bros. 3' => ['Super Mario Bros. 3', 'super mario bros 00003'],
             'The Great Escape' => ['The Great Escape', 'great escape'],
             'The Matrix Reloaded' => ['The Matrix Reloaded', 'matrix reloaded'],
+            'V-Tetris' => ['V-Tetris', 'v-tetris'],
         ];
     }
 }