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 -N -r1.33.2.9 -r1.33.2.10
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl	22 Feb 2017 10:03:30 -0000	1.33.2.9
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl	7 Mar 2017 09:30:10 -0000	1.33.2.10
@@ -504,6 +504,14 @@
     if {$parent eq ".."} {
       set current_folder [$current_folder parent_id]
       ::xo::db::CrClass get_instance_from_db -item_id $current_folder
+    } else {
+      set page [$package_id get_page_from_item_ref \
+                    -use_package_path true \
+                    -use_site_wide_pages true \
+                    -use_prototype_pages true \
+                    -parent_id [$current_folder item_id] \
+                    $parent]
+      set current_folder $page
     }
 
     if {![$current_folder istype ::xowiki::FormPage]} {