Index: openacs-4/packages/xowiki/tcl/folder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/folder-procs.tcl,v
diff -u -r1.55.2.48 -r1.55.2.49
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl	29 Jul 2021 15:44:46 -0000	1.55.2.48
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl	9 Aug 2021 09:55:57 -0000	1.55.2.49
@@ -337,7 +337,6 @@
       }
       lappend bind_vars nls_language $nls_language
 
-      set return_url [::xo::cc url]
       $mb current_folder ${:current_folder}
       $mb parent_id $opt_parent_id
       #:log "folders: call update_items with config '$config' bind_vars=$bind_vars"
@@ -347,7 +346,7 @@
           -current_page $page \
           -folder_link $folder_link \
           -package_id $package_id \
-          -return_url $return_url
+          -return_url [ad_urlencode_folder_path [::xo::cc url]]
     }
 
     # Start with the "package's folder" as root folder