diff --git a/static/js/folderList.js b/static/js/folderList.js
index c97083bfb..03cccd746 100644
--- a/static/js/folderList.js
+++ b/static/js/folderList.js
@@ -287,7 +287,9 @@ pandora.ui.folderList = function(id, section) {
         // works when switching back from browser, but won't work on load, since
         // getListData relies on $folderList, so selectList is called in init handler
         selected: pandora.getListData().folder == id
-            ? [ui[ui.section == 'items' ? '_list' : ui.section.slice(0, -1)]]
+            ? [ui[ui.section == 'items' ? '_list'
+                  : ui.section == 'documents' ? '_collection'
+                  : ui.section.slice(0, -1)]]
             : [],
         sort: [{key: 'position', operator: '+'}],
         sortable: id != 'featured' || canEditFeatured,
diff --git a/static/js/mainPanel.js b/static/js/mainPanel.js
index 7460a3c87..7213ae59e 100644
--- a/static/js/mainPanel.js
+++ b/static/js/mainPanel.js
@@ -23,7 +23,7 @@ pandora.ui.mainPanel = function() {
         .bindEvent({
             pandora_finddocuments: function() {
                 var previousUI = pandora.UI.getPrevious();
-                Ox.Log('FIND', 'handled in mainPanel', previousUI.item, previousUI._list)
+                Ox.Log('FIND', 'finddocuments handled in mainPanel', previousUI.document, previousUI._collection)
                 if (!previousUI.document && ui._collection == previousUI._collection) {
                     pandora.$ui.list.reloadList();
 
@@ -54,7 +54,7 @@ pandora.ui.mainPanel = function() {
                     if (pandora.stayInItemView) {
                         pandora.stayInItemView = false;
                     } else {
-                        that.replaceElement(1, pandora.$ui.rightPanel = pandora.ui.rightPanel());
+                        that.replaceElement(1, pandora.$ui.documentPanel = pandora.ui.documentPanel());
                     }
                 }
             },
@@ -68,7 +68,7 @@ pandora.ui.mainPanel = function() {
             },
             pandora_find: function() {
                 var previousUI = pandora.UI.getPrevious();
-                Ox.Log('FIND', 'handled in mainPanel', previousUI.item, previousUI._list)
+                Ox.Log('FIND', 'find handled in mainPanel', previousUI.item, previousUI._list)
                 if (!previousUI.item && ui._list == previousUI._list) {
                     if (['map', 'calendar'].indexOf(ui.listView) > -1) {
                         pandora.$ui.contentPanel.replaceElement(1,