diff --git a/b0esche_cloud/lib/blocs/file_browser/file_browser_bloc.dart b/b0esche_cloud/lib/blocs/file_browser/file_browser_bloc.dart
index 5b671ba..156a3b5 100644
--- a/b0esche_cloud/lib/blocs/file_browser/file_browser_bloc.dart
+++ b/b0esche_cloud/lib/blocs/file_browser/file_browser_bloc.dart
@@ -123,24 +123,8 @@ class FileBrowserBloc extends Bloc<FileBrowserEvent, FileBrowserState> {
         event.parentPath,
         event.folderName,
       );
-      // Add the new folder to local state if in current directory
-      if (event.parentPath == _currentPath) {
-        final newFolder = FileItem(
-          name: event.folderName,
-          path: '${event.parentPath}/${event.folderName}',
-          type: FileType.folder,
-          size: 0,
-          lastModified: DateTime.now(),
-        );
-        _currentFiles.add(newFolder);
-        _currentFiles = _sortFiles(_currentFiles, _sortBy, _isAscending);
-        _filteredFiles = _currentFiles
-            .where((f) => f.name.toLowerCase().contains(_currentFilter))
-            .toList();
-        _emitLoadedState(emit);
-      } else {
-        add(LoadDirectory(orgId: event.orgId, path: event.parentPath));
-      }
+      // Reload directory to get the folder with proper ID from backend
+      add(LoadDirectory(orgId: event.orgId, path: event.parentPath));
     } catch (e) {
       emit(DirectoryError(_getErrorMessage(e)));
     }
diff --git a/b0esche_cloud/lib/services/file_service.dart b/b0esche_cloud/lib/services/file_service.dart
index e4c454d..606b3b4 100644
--- a/b0esche_cloud/lib/services/file_service.dart
+++ b/b0esche_cloud/lib/services/file_service.dart
@@ -119,9 +119,9 @@ class FileService {
     String parentPath,
     String folderName,
   ) async {
-    final path = parentPath.endsWith('/')
-        ? '$parentPath$folderName'
-        : '$parentPath/$folderName';
+    // Normalize parent path and construct new folder path
+    final normalizedParent = parentPath == '/' ? '' : parentPath;
+    final path = '$normalizedParent/$folderName';
     final data = {
       'name': folderName,
       'path': path,
diff --git a/go_cloud/bin/api b/go_cloud/bin/api
index 831aac7..f5c6d35 100755
Binary files a/go_cloud/bin/api and b/go_cloud/bin/api differ
diff --git a/go_cloud/internal/database/db.go b/go_cloud/internal/database/db.go
index 0fd5a24..f8ce5c6 100644
--- a/go_cloud/internal/database/db.go
+++ b/go_cloud/internal/database/db.go
@@ -264,15 +264,22 @@ func (db *DB) GetOrgFiles(ctx context.Context, orgID uuid.UUID, path string, q s
 	}
 	offset := (page - 1) * pageSize
 
-	// Basic search and pagination. Returns files under the given path (including nested).
+	// Basic search and pagination. Returns only direct children of the given path.
+	// For root ("/"), we want files where path doesn't contain "/" after the first character.
+	// For subdirs, we want files where path starts with parent but has no additional "/" after parent.
 	rows, err := db.QueryContext(ctx, `
 		SELECT id, org_id::text, user_id::text, name, path, type, size, last_modified, created_at
 		FROM files
-		WHERE org_id = $1 AND path != $2 AND path LIKE $2 || '/%'
-		AND ($4 = '' OR name ILIKE '%' || $4 || '%')
+		WHERE org_id = $1 
+			AND path != $2
+			AND (
+				($2 = '/' AND path LIKE '/%' AND path NOT LIKE '/%/%')
+				OR ($2 != '/' AND path LIKE $2 || '/%' AND path NOT LIKE $2 || '/%/%')
+			)
+			AND ($3 = '' OR name ILIKE '%' || $3 || '%')
 		ORDER BY name
-		LIMIT $5 OFFSET $6
-	`, orgID, path, path, q, pageSize, offset)
+		LIMIT $4 OFFSET $5
+	`, orgID, path, q, pageSize, offset)
 	if err != nil {
 		return nil, err
 	}
@@ -309,11 +316,17 @@ func (db *DB) GetUserFiles(ctx context.Context, userID uuid.UUID, path string, q
 	}
 	offset := (page - 1) * pageSize
 
+	// Return only direct children of the given path
 	rows, err := db.QueryContext(ctx, `
 		SELECT id, org_id::text, user_id::text, name, path, type, size, last_modified, created_at
 		FROM files
-		WHERE user_id = $1 AND path LIKE $2 || '%'
-		AND ($3 = '' OR name ILIKE '%' || $3 || '%')
+		WHERE user_id = $1
+			AND path != $2
+			AND (
+				($2 = '/' AND path LIKE '/%' AND path NOT LIKE '/%/%')
+				OR ($2 != '/' AND path LIKE $2 || '/%' AND path NOT LIKE $2 || '/%/%')
+			)
+			AND ($3 = '' OR name ILIKE '%' || $3 || '%')
 		ORDER BY name
 		LIMIT $4 OFFSET $5
 	`, userID, path, q, pageSize, offset)
diff --git a/go_cloud/internal/middleware/middleware.go b/go_cloud/internal/middleware/middleware.go
index 215a18c..7c3f9fc 100644
--- a/go_cloud/internal/middleware/middleware.go
+++ b/go_cloud/internal/middleware/middleware.go
@@ -27,6 +27,7 @@ func CORS(next http.Handler) http.Handler {
 		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS")
 		w.Header().Set("Access-Control-Allow-Headers", "Content-Type, Authorization")
+		w.Header().Set("Access-Control-Allow-Credentials", "true")
 		w.Header().Set("Access-Control-Max-Age", "3600")
 
 		if r.Method == http.MethodOptions {