diff --git a/src-tauri/yaak-models/guest-js/atoms.ts b/src-tauri/yaak-models/guest-js/atoms.ts
index eed36111..fc12373d 100644
--- a/src-tauri/yaak-models/guest-js/atoms.ts
+++ b/src-tauri/yaak-models/guest-js/atoms.ts
@@ -8,7 +8,7 @@ import { newStoreData } from './util';
 export const modelStoreDataAtom = atom(newStoreData());
 
 export const cookieJarsAtom = createOrderedModelAtom('cookie_jar', 'name', 'asc');
-export const environmentsAtom = createOrderedModelAtom('environment', 'name', 'asc');
+export const environmentsAtom = createOrderedModelAtom('environment', 'sortPriority', 'asc');
 export const foldersAtom = createModelAtom('folder');
 export const grpcConnectionsAtom = createOrderedModelAtom('grpc_connection', 'createdAt', 'desc');
 export const grpcEventsAtom = createOrderedModelAtom('grpc_event', 'createdAt', 'asc');
diff --git a/src-web/components/EnvironmentEditDialog.tsx b/src-web/components/EnvironmentEditDialog.tsx
index feeb9774..6ec6c3be 100644
--- a/src-web/components/EnvironmentEditDialog.tsx
+++ b/src-web/components/EnvironmentEditDialog.tsx
@@ -331,12 +331,7 @@ const treeAtom = atom<TreeNode<TreeModel> | null>((get) => {
 
   const parent = root.children?.[0];
   if (baseEnvironments.length <= 1 && parent != null) {
-    const sortedEnvironments = [...subEnvironments].sort((a, b) => {
-      if (a.sortPriority === b.sortPriority) return a.updatedAt > b.updatedAt ? 1 : -1;
-      else return a.sortPriority - b.sortPriority;
-    });
-
-    parent.children = sortedEnvironments.map((item) => ({
+    parent.children = subEnvironments.map((item) => ({
       item,
       parent,
       depth: 1,