diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorage.java b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
index a0669f7d2..983690135 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStorage.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
@@ -361,6 +361,11 @@ public abstract class DataStorage {
             newEntry.setIcon(icon, true);
         }
 
+        var orderIndex = entry.getOrderIndex();
+        if (newEntry.getOrderIndex() == 0.0) {
+            newEntry.setOrderIndex(orderIndex);
+        }
+
         var syntheticParent = getSyntheticParent(newEntry);
         if (syntheticParent.isPresent()) {
             addStoreEntryIfNotPresent(syntheticParent.get());
diff --git a/dist/changelog/24.0.4.md b/dist/changelog/24.0.4.md
index 02569358a..ce7a0d577 100644
--- a/dist/changelog/24.0.4.md
+++ b/dist/changelog/24.0.4.md
@@ -1,2 +1,3 @@
 - Fix password manager identities not properly disabling external agents when not wanted
 - Fix SSH connections in terminal failing when Windows username contained spaces
+- Fix connection entries being put at the bottom after editing instead of the top