diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java
index e5e466d93..eb39ff0ec 100644
--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java
@@ -489,7 +489,7 @@ public final class BrowserFileSystemTabModel extends BrowserStoreSessionTab<File
                                 .orElse(null)
                         == ShellDialects.CMD) {
             var env = ProcModuleProvider.get().subShellEnvironment(getEntry().asNeeded(), ShellDialects.POWERSHELL);
-            var entry = DataStoreEntry.createNew(getName().getValue() + " (PowerShell)", env);
+            var entry = DataStoreEntry.createNew("PowerShell", env);
             entry.setColor(DataStorage.get().getEffectiveColor(getEntry().get()));
             entry.setCategoryUuid(getEntry().get().getCategoryUuid());
             bm.openFileSystemAsync(entry.ref(), null, m -> FilePath.of(path), null);
diff --git a/app/src/main/java/io/xpipe/app/hub/category/StoreCategoryWrapper.java b/app/src/main/java/io/xpipe/app/hub/category/StoreCategoryWrapper.java
index d1c31960d..99a50ec64 100644
--- a/app/src/main/java/io/xpipe/app/hub/category/StoreCategoryWrapper.java
+++ b/app/src/main/java/io/xpipe/app/hub/category/StoreCategoryWrapper.java
@@ -369,6 +369,10 @@ public class StoreCategoryWrapper {
     public void insertSiblingCategory(StoreCategoryWrapper selection, boolean after) {
         var l = getParent().getShownChildren().getList();
         var index = l.indexOf(this);
+        if (index == -1) {
+            return;
+        }
+
         var min = index > 0 || after
                 ? l.get(index - (after ? 0 : 1)).getCategory().getOrderIndex()
                 : l.getFirst().getCategory().getOrderIndex() - 1.0;
diff --git a/app/src/main/java/io/xpipe/app/util/FilePath.java b/app/src/main/java/io/xpipe/app/util/FilePath.java
index 6a39b7a1b..7b2865f1d 100644
--- a/app/src/main/java/io/xpipe/app/util/FilePath.java
+++ b/app/src/main/java/io/xpipe/app/util/FilePath.java
@@ -224,24 +224,14 @@ public final class FilePath {
         }
 
         var joined = String.join("/", split());
-        var prefix = hasWindowsUncPrefix() ? "//" : value.startsWith("/") ? "/" : "";
+        var prefix = value.startsWith("/") ? "/" : "";
         var suffix = value.endsWith("/") || value.endsWith("\\") ? "/" : "";
         return FilePath.of(prefix + joined + suffix);
     }
 
     public FilePath toWindows() {
-        var prefix = hasWindowsUncPrefix() ? "\\\\" : "";
         var suffix = value.endsWith("/") || value.endsWith("\\") ? "\\" : "";
-        return FilePath.of(prefix + String.join("\\", split()) + suffix);
-    }
-
-    /**
-     * Returns whether this file path has a Universal Naming Convention (UNC) prefix.
-     *
-     * @return true if the file path has a UNC prefix, false otherwise
-     */
-    private boolean hasWindowsUncPrefix() {
-        return value.startsWith("\\\\") && !split().isEmpty();
+        return FilePath.of(String.join("\\", split()) + suffix);
     }
 
     public boolean isRoot() {