diff --git a/b0esche_cloud/lib/pages/file_explorer.dart b/b0esche_cloud/lib/pages/file_explorer.dart
index bbd9385..aaa310d 100644
--- a/b0esche_cloud/lib/pages/file_explorer.dart
+++ b/b0esche_cloud/lib/pages/file_explorer.dart
@@ -60,6 +60,17 @@ class _FileExplorerState extends State<FileExplorer> {
     );
     context.read<PermissionBloc>().add(LoadPermissions(widget.orgId));
   }
+  
+  @override
+  void didUpdateWidget(covariant FileExplorer oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.orgId != widget.orgId) {
+      // Reset and reload when switching between Personal and Org workspaces
+      final bloc = context.read<FileBrowserBloc>();
+      bloc.add(ResetFileBrowser());
+      bloc.add(LoadDirectory(orgId: widget.orgId, path: '/'));
+    }
+  }
 
   Future<String?> _showCreateFolderDialog(BuildContext context) async {
     final TextEditingController controller = TextEditingController();