diff --git a/query/webapp/dataview/DataViewsPanel.js b/query/webapp/dataview/DataViewsPanel.js
index 8d8ae2de469..08a969a5d87 100644
--- a/query/webapp/dataview/DataViewsPanel.js
+++ b/query/webapp/dataview/DataViewsPanel.js
@@ -705,7 +705,7 @@ Ext4.define('LABKEY.ext4.DataViewsPanel', {
                 },
                 scope : this
             },
-            hidden   : !this.manageView,
+            hidden   : !this.editMode,
             scope    : this
         },{
             xtype    : 'fatreecolumn',
@@ -1050,14 +1050,20 @@ Ext4.define('LABKEY.ext4.DataViewsPanel', {
 
     onEnableEditMode : function() {
         this.editMode = true;
-        this._getEditColumn().show();
+        var editColumn = this._getEditColumn();
+        if (editColumn) {
+            editColumn.show();
+        }
         this.refreshViewStore();
         this.applySearchFilter();
     },
 
     onDisableEditMode : function() {
         this.editMode = false;
-        this._getEditColumn().hide();
+        var editColumn = this._getEditColumn();
+        if (editColumn) {
+            editColumn.hide();
+        }
         this.refreshViewStore();
         this.applySearchFilter();
     },