diff --git a/static/js/pandora/mainPanel.js b/static/js/pandora/mainPanel.js
index 17f43954..478b5c60 100644
--- a/static/js/pandora/mainPanel.js
+++ b/static/js/pandora/mainPanel.js
@@ -14,14 +14,16 @@ pandora.ui.mainPanel = function() {
                         + Ox.SYMBOLS.SHIFT + 'S</span>'
                 },
                 {
-                    element: pandora.$ui.rightPanel = pandora.ui.rightPanel()
+                    element: pandora.user.ui.section == 'items' ? pandora.$ui.rightPanel = pandora.ui.rightPanel()
+                        : pandora.user.ui.section == 'edits' ? pandora.$ui.editPanel = pandora.ui.editPanel()
+                        : pandora.$ui.textPanel = pandora.ui.textPanel()
                 }
             ],
             orientation: 'horizontal'
         })
         .bindEvent({
             pandora_edit: function(data) {
-                that.replaceElement(1, pandora.$ui.rightPanel = pandora.ui.rightPanel());
+                that.replaceElement(1, pandora.$ui.editPanel = pandora.ui.editPanel());
             },
             pandora_find: function() {
                 var previousUI = pandora.UI.getPrevious();
@@ -83,7 +85,7 @@ pandora.ui.mainPanel = function() {
                 data.value == that.options('elements')[0].collapsed && that.toggle(0);
             },
             pandora_text: function(data) {
-                that.replaceElement(1, pandora.$ui.rightPanel = pandora.ui.rightPanel());
+                that.replaceElement(1, pandora.$ui.textPanel = pandora.ui.textPanel());
             }
         });
     return that;
diff --git a/static/js/pandora/rightPanel.js b/static/js/pandora/rightPanel.js
index a1144829..3f4eb614 100644
--- a/static/js/pandora/rightPanel.js
+++ b/static/js/pandora/rightPanel.js
@@ -3,9 +3,7 @@
 'use strict';
 
 pandora.ui.rightPanel = function() {
-    var that;
-    if (pandora.user.ui.section == 'items') {
-        that = Ox.SplitPanel({
+    var that = Ox.SplitPanel({
             elements: [
                 {
                     element: pandora.$ui.toolbar = pandora.ui.toolbar(),
@@ -61,11 +59,6 @@ pandora.ui.rightPanel = function() {
                 }
             }
         });
-    } else if (pandora.user.ui.section == 'texts') {
-        that = pandora.$ui.textPanel = pandora.ui.textPanel();
-    } else if (pandora.user.ui.section == 'edits') {
-        that = pandora.$ui.editPanel = pandora.ui.editPanel();
-    }
     return that;
 };