diff --git a/internal/database/indexer.go b/internal/database/indexer.go
index 66ea8f6..d36e5cf 100644
--- a/internal/database/indexer.go
+++ b/internal/database/indexer.go
@@ -57,7 +57,7 @@ func (r *IndexerRepo) Update(indexer domain.Indexer) (*domain.Indexer, error) {
 
 func (r *IndexerRepo) List() ([]domain.Indexer, error) {
 
-	rows, err := r.db.Query("SELECT id, enabled, name, identifier, settings FROM indexer")
+	rows, err := r.db.Query("SELECT id, enabled, name, identifier, settings FROM indexer ORDER BY name ASC")
 	if err != nil {
 		log.Fatal().Err(err)
 	}
diff --git a/internal/database/irc.go b/internal/database/irc.go
index 321ed6e..fb0d087 100644
--- a/internal/database/irc.go
+++ b/internal/database/irc.go
@@ -111,7 +111,7 @@ func (ir *IrcRepo) FindActiveNetworks(ctx context.Context) ([]domain.IrcNetwork,
 
 func (ir *IrcRepo) ListNetworks(ctx context.Context) ([]domain.IrcNetwork, error) {
 
-	rows, err := ir.db.QueryContext(ctx, "SELECT id, enabled, name, server, port, tls, pass, invite_command, nickserv_account, nickserv_password FROM irc_network")
+	rows, err := ir.db.QueryContext(ctx, "SELECT id, enabled, name, server, port, tls, pass, invite_command, nickserv_account, nickserv_password FROM irc_network ORDER BY name ASC")
 	if err != nil {
 		log.Fatal().Err(err)
 	}