diff --git a/app/src/main/java/io/xpipe/app/comp/store/GuiDsStoreCreator.java b/app/src/main/java/io/xpipe/app/comp/store/GuiDsStoreCreator.java
index 4058cf8e4..9545a9ce7 100644
--- a/app/src/main/java/io/xpipe/app/comp/store/GuiDsStoreCreator.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/GuiDsStoreCreator.java
@@ -110,13 +110,22 @@ public class GuiDsStoreCreator extends MultiStepComp.Step<CompStructure<?>> {
                     name.getValue(),
                     store.getValue());
             var p = provider.getValue().getDisplayParent(testE);
+
+            var targetCategory = p != null
+                    ? p.getCategoryUuid()
+                    : DataStorage.get()
+                    .getSelectedCategory()
+                    .getUuid();
+            var rootCategory = DataStorage.get().getRootCategory(DataStorage.get().getStoreCategoryIfPresent(targetCategory).orElseThrow());
+            // Don't put connections in the scripts category ever
+            if (!provider.getValue().getCreationCategory().equals(DataStoreProvider.CreationCategory.SCRIPT) &&
+                    rootCategory.equals(DataStorage.get().getAllScriptsCategory())) {
+                targetCategory = DataStorage.get().getDefaultCategory().getUuid();
+            }
+
             return DataStoreEntry.createNew(
                     UUID.randomUUID(),
-                    p != null
-                            ? p.getCategoryUuid()
-                            : DataStorage.get()
-                            .getSelectedCategory()
-                            .getUuid(),
+                    targetCategory,
                     name.getValue(),
                     store.getValue());
         }, name, store);
diff --git a/dist/changelogs/1.7.13.md b/dist/changelogs/1.7.13.md
new file mode 100644
index 000000000..cb20946ca
--- /dev/null
+++ b/dist/changelogs/1.7.13.md
@@ -0,0 +1,16 @@
+## New professional features
+
+- Add ability to open files and directories in VSCode SSH remote environment in file browser
+- Added support for fully offline licenses. You can obtain them via email request
+  in case you're running it on a system without internet connectivity or restricted proxy settings
+
+## Changes
+
+
+## Additions
+
+
+## Fixes
+
+- Fix connections being accidentally listed under scripts category
+  if they were added while scripts category was selected