diff --git a/P3D/Pokemon/Items/GameModeItemLoader.vb b/P3D/Pokemon/Items/GameModeItemLoader.vb
index 21d5636d2..c8d0b86a9 100644
--- a/P3D/Pokemon/Items/GameModeItemLoader.vb
+++ b/P3D/Pokemon/Items/GameModeItemLoader.vb
@@ -186,6 +186,11 @@ Public Class GameModeItemLoader
                 ElseIf item.gmName.StartsWith("TM") Then
                     item.gmSortValue = CInt(item.gmName.Remove(0, 2)) + 190
                 End If
+                If item.gmName.StartsWith("HM ") Then
+                    item.gmSortValue = -100000 + CInt(item.gmName.Remove(0, 3))
+                ElseIf item.gmName.StartsWith("HM") Then
+                    item.gmSortValue = -100000 + CInt(item.gmName.Remove(0, 2))
+                End If
                 item.gmTextureSource = "Items\ItemSheet"
                 item.SetTeachMoveTextureRectangle()
 
diff --git a/P3D/Screens/Inventory/NewInventoryScreen.vb b/P3D/Screens/Inventory/NewInventoryScreen.vb
index 06b4967ad..3537601bb 100644
--- a/P3D/Screens/Inventory/NewInventoryScreen.vb
+++ b/P3D/Screens/Inventory/NewInventoryScreen.vb
@@ -494,13 +494,15 @@ Public Class NewInventoryScreen
                     itemTitle = CType(cItem, GameModeItem).gmTeachMove.Name
 
                     If CType(cItem, GameModeItem).gmIsTM Then
-                        'JSON stuff
-                        'itemSubTitle = _translation.TECH_MACHINE_TITLE(cItem.ItemType.ToString())
-                        itemSubTitle = "Technical Machine"
-                    Else
-                        'JSON stuff
-                        'itemSubTitle = _translation.HIDDEN_MACHINE_TITLE(cItem.ItemType.ToString())
-                        itemSubTitle = "Hidden Machine"
+                        If CType(cItem, GameModeItem).OriginalName.StartsWith("HM") Then
+                            'JSON stuff
+                            'itemSubTitle = _translation.HIDDEN_MACHINE_TITLE(cItem.ItemType.ToString())
+                            itemSubTitle = "Hidden Machine"
+                        Else
+                            'JSON stuff
+                            'itemSubTitle = _translation.TECH_MACHINE_TITLE(cItem.ItemType.ToString())
+                            itemSubTitle = "Technical Machine"
+                        End If
                     End If
 
                     itemDescription &= Environment.NewLine & CType(cItem, GameModeItem).gmTeachMove.Description