diff --git a/src/database/Artist.cpp b/src/database/Artist.cpp
index 194b8581..ccff0b47 100644
--- a/src/database/Artist.cpp
+++ b/src/database/Artist.cpp
@@ -65,7 +65,7 @@ Artist::create(Wt::Dbo::Session& session, const std::string& name, const std::st
 std::vector<Artist::pointer>
 Artist::getAll(Wt::Dbo::Session& session, int offset, int size)
 {
-	Wt::Dbo::collection<pointer> res = session.find<Artist>().orderBy("LOWER(name)").offset(offset).limit(size);
+	Wt::Dbo::collection<pointer> res = session.find<Artist>().offset(offset).limit(size);
 	return std::vector<pointer>(res.begin(), res.end());
 }
 
@@ -107,7 +107,7 @@ getQuery(Wt::Dbo::Session& session,
 	if (!clusterIds.empty())
 		oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size();
 
-	oss << " ORDER BY a.name";
+	oss << " ORDER BY a.name COLLATE NOCASE";
 
 	Wt::Dbo::Query<Artist::pointer> query = session.query<Artist::pointer>( oss.str() );
 
diff --git a/src/database/Release.cpp b/src/database/Release.cpp
index 6ca6cebb..6f97e3a3 100644
--- a/src/database/Release.cpp
+++ b/src/database/Release.cpp
@@ -119,7 +119,7 @@ getQuery(Wt::Dbo::Session& session,
 	if (!clusterIds.empty())
 		oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size();
 
-	oss << " ORDER BY r.name";
+	oss << " ORDER BY r.name COLLATE NOCASE";
 
 	Wt::Dbo::Query<Release::pointer> query = session.query<Release::pointer>( oss.str() );
 
diff --git a/src/database/Track.cpp b/src/database/Track.cpp
index 6729fd24..aa95619e 100644
--- a/src/database/Track.cpp
+++ b/src/database/Track.cpp
@@ -146,7 +146,7 @@ getQuery(Wt::Dbo::Session& session,
 	if (!clusterIds.empty())
 		oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size();
 
-	oss << " ORDER BY t.name";
+	oss << " ORDER BY t.name COLLATE NOCASE";
 
 	Wt::Dbo::Query<Track::pointer> query = session.query<Track::pointer>( oss.str() );