diff --git a/app/client/src/views/Games.js b/app/client/src/views/Games.js
index 8398d6d7..36493c93 100644
--- a/app/client/src/views/Games.js
+++ b/app/client/src/views/Games.js
@@ -149,7 +149,9 @@ const Games = ({ authenticated }) => {
       </Box>
 
       <Grid container spacing={2}>
-        {games.map((game) => {
+        {[...games]
+          .sort((a, b) => (a.name || '').localeCompare(b.name || '', undefined, { sensitivity: 'base' }))
+          .map((game) => {
           const isHovered = hoveredGame === game.steamgriddb_id
           const heroTransform = isHovered
             ? `translate(${mousePos.x * -15}px, ${mousePos.y * -15}px) scale(1.1)`
diff --git a/app/server/fireshare/api.py b/app/server/fireshare/api.py
index 86c3cb30..7ae5283a 100644
--- a/app/server/fireshare/api.py
+++ b/app/server/fireshare/api.py
@@ -958,7 +958,7 @@ def get_games():
 
     # If user is authenticated, show all games
     if current_user.is_authenticated:
-        games = GameMetadata.query.all()
+        games = GameMetadata.query.order_by(GameMetadata.name).all()
     else:
         # For public users, only show games that have at least one public (available) video
         games = (
@@ -971,6 +971,7 @@ def get_games():
                 VideoInfo.private.is_(False),
             )
             .distinct()
+            .order_by(GameMetadata.name)
             .all()
         )