diff --git a/app/components/new-container/component.js b/app/components/new-container/component.js
index 3ab514e6d..8f6903bb9 100644
--- a/app/components/new-container/component.js
+++ b/app/components/new-container/component.js
@@ -38,7 +38,12 @@ export default Ember.Component.extend(NewOrEdit, SelectTab, {
       if ( this.$() )
       {
         this.$().children('[data-launchindex]').addClass('hide');
-        this.$().children('[data-launchindex="'+index+'"]').removeClass('hide');
+        var body = this.$().children('[data-launchindex="'+index+'"]')[0];
+        if ( body )
+        {
+          $(body).removeClass('hide');
+          $("INPUT[type='text']", body)[0].focus();
+        }
       }
     },
 
diff --git a/app/utils/debounce.js b/app/utils/debounce.js
index 60f24e883..e2976d926 100644
--- a/app/utils/debounce.js
+++ b/app/utils/debounce.js
@@ -23,7 +23,7 @@ export function debouncedObserver(...args) {
 
   return Ember.observer.apply(Ember, keys.concat(function() {
     Ember.run.debounce(this, function() {
-      if ( this.state !== 'destroying' ) {
+      if ( this._state !== 'destroying' ) {
         opt[0].apply(this);
       }
     }, opt[1] || 250, opt[2] || false);