diff --git a/mozilla/webtools/testopia/testopia/js/case.js b/mozilla/webtools/testopia/testopia/js/case.js
index 004835e15f7..fb17cd33ee3 100644
--- a/mozilla/webtools/testopia/testopia/js/case.js
+++ b/mozilla/webtools/testopia/testopia/js/case.js
@@ -184,12 +184,16 @@ CaseGrid = function(params, cfg){
         sm: new Ext.grid.RowSelectionModel({
             singleSelect: false,
             listeners: {'rowselect':function(sm,i,r){
-                Ext.getCmp('delete_case_list_btn').enable();
-                Ext.getCmp('edit_case_list_btn').enable();
+                if (Ext.getCmp('delete_case_list_btn')){
+                    Ext.getCmp('delete_case_list_btn').enable();
+                    Ext.getCmp('edit_case_list_btn').enable();
+                }
             },'rowdeselect': function(sm,i,r){
                 if (sm.getCount() < 1){
-                    Ext.getCmp('delete_case_list_btn').disable();
-                    Ext.getCmp('edit_case_list_btn').disable();
+                    if (Ext.getCmp('delete_case_list_btn')) {
+                        Ext.getCmp('delete_case_list_btn').disable();
+                        Ext.getCmp('edit_case_list_btn').disable();
+                    }
                 }
             }}
         }),
diff --git a/mozilla/webtools/testopia/testopia/js/run.js b/mozilla/webtools/testopia/testopia/js/run.js
index 2121f06c767..7b00abc8d1c 100644
--- a/mozilla/webtools/testopia/testopia/js/run.js
+++ b/mozilla/webtools/testopia/testopia/js/run.js
@@ -629,6 +629,7 @@ var NewRunForm = function(plan){
         id: 'newrun_casegrid',
         height: 500
     });
+    this.casegrid = casegrid;
     casegrid.on('render', function(g){
         for (var i=0; i < g.getTopToolbar().items.length; i++){
             g.getTopToolbar().items.items[i].destroy();