diff --git a/frontend/src/component/project/Project/Project.styles.ts b/frontend/src/component/project/Project/Project.styles.ts
index 0bec042730..6231c8fdcf 100644
--- a/frontend/src/component/project/Project/Project.styles.ts
+++ b/frontend/src/component/project/Project/Project.styles.ts
@@ -17,9 +17,8 @@ export const StyledColumn = styled('div')(() => ({
     flexDirection: 'column',
 }));
 
-export const StyledName = styled('h1')(({ theme }) => ({
+export const StyledName = styled('span')(({ theme }) => ({
     fontSize: theme.typography.h1.fontSize,
-    overflow: 'hidden',
     textOverflow: 'ellipsis',
     whiteSpace: 'nowrap',
 }));
diff --git a/src/lib/db/feature-environment-store.ts b/src/lib/db/feature-environment-store.ts
index 5785a86c29..5e868b8bc5 100644
--- a/src/lib/db/feature-environment-store.ts
+++ b/src/lib/db/feature-environment-store.ts
@@ -112,7 +112,9 @@ export class FeatureEnvironmentStore implements IFeatureEnvironmentStore {
         features: string[],
         environment?: string,
     ): Promise<IFeatureEnvironment[]> {
-        let rows = this.db(T.featureEnvs).whereIn('feature_name', features);
+        let rows = this.db(T.featureEnvs)
+            .whereIn('feature_name', features)
+            .orderBy('feature_name', 'asc');
         if (environment) {
             rows = rows.where({ environment });
         }
diff --git a/src/lib/db/feature-strategy-store.ts b/src/lib/db/feature-strategy-store.ts
index 6e718f0c15..e7206c03ee 100644
--- a/src/lib/db/feature-strategy-store.ts
+++ b/src/lib/db/feature-strategy-store.ts
@@ -209,7 +209,8 @@ class FeatureStrategiesStore implements IFeatureStrategiesStore {
         const query = this.db
             .select(COLUMNS)
             .from<IFeatureStrategiesTable>(T.featureStrategies)
-            .whereIn('feature_name', features);
+            .whereIn('feature_name', features)
+            .orderBy('feature_name', 'asc');
         if (environment) {
             query.where('environment', environment);
         }
diff --git a/src/lib/db/feature-tag-store.ts b/src/lib/db/feature-tag-store.ts
index e405403e3f..9c3dfea473 100644
--- a/src/lib/db/feature-tag-store.ts
+++ b/src/lib/db/feature-tag-store.ts
@@ -109,7 +109,8 @@ class FeatureTagStore implements IFeatureTagStore {
         const query = this.db
             .select(COLUMNS)
             .from<FeatureTagTable>(TABLE)
-            .whereIn('feature_name', features);
+            .whereIn('feature_name', features)
+            .orderBy('feature_name', 'asc');
         const rows = await query;
         return rows.map((row) => ({
             featureName: row.feature_name,
diff --git a/src/lib/db/feature-toggle-store.ts b/src/lib/db/feature-toggle-store.ts
index 562c1fb438..041c6d5a00 100644
--- a/src/lib/db/feature-toggle-store.ts
+++ b/src/lib/db/feature-toggle-store.ts
@@ -104,7 +104,7 @@ export default class FeatureToggleStore implements IFeatureToggleStore {
     }
 
     async getAllByNames(names: string[]): Promise<FeatureToggle[]> {
-        const query = this.db<FeaturesTable>(TABLE);
+        const query = this.db<FeaturesTable>(TABLE).orderBy('name', 'asc');
         if (names.length > 0) {
             query.whereIn('name', names);
         }