diff --git a/static/js/pandora/infoView.js b/static/js/pandora/infoView.js
index 63518f965..5cfb44b1f 100644
--- a/static/js/pandora/infoView.js
+++ b/static/js/pandora/infoView.js
@@ -652,7 +652,7 @@ pandora.ui.infoView = function(data) {
                     max: 1,
                     min: 1,
                     orientation: 'both',
-                    selected: [selectedImage['index']],
+                    selected: selectedImage?[selectedImage['index']]:[],
                     size: 128,
                     sort: [{key: 'index', operator: '+'}],
                     unique: 'index'
diff --git a/static/js/pandora/mainPanel.js b/static/js/pandora/mainPanel.js
index 314d6a01c..926036e90 100644
--- a/static/js/pandora/mainPanel.js
+++ b/static/js/pandora/mainPanel.js
@@ -20,7 +20,7 @@ pandora.ui.mainPanel = function() {
         .bindEvent({
             pandora_find: function() {
                 var previousUI = pandora.UI.getPrevious();
-                if (pandora.user.ui._list == previousUI._list) {
+                if (pandora.user.ui._list == previousUI._list && pandora.$ui.list) {
                     if (['map', 'calendar'].indexOf(pandora.user.ui.listView) > -1) {
                         pandora.$ui.contentPanel.replaceElement(1,
                             pandora.ui.navigationView(pandora.user.ui.listView)