diff --git a/plugins/c9.ide.editors/tabmanager.js b/plugins/c9.ide.editors/tabmanager.js
index df0aa20c..61b4462f 100644
--- a/plugins/c9.ide.editors/tabmanager.js
+++ b/plugins/c9.ide.editors/tabmanager.js
@@ -220,13 +220,14 @@ define(function(require, module, exports) {
                 }
                 
                 setTimeout(function() {
-                    // Only set the state if we're not testing something else
-                    if (options.testing != 2 && !isReady) {
+                    var wasReady = isReady;
+                    isReady = true;
+                    if (options.testing != 2 && !wasReady) {
+                        // Only fire if we're not testing something else
                         setState(state, !isReady, function(){
                             emit.sticky("ready");
                         });
                     }
-                    isReady = true;
                     
                     showTabs = settings.getBool("user/tabs/@show");
                     toggleButtons(showTabs);
@@ -990,6 +991,8 @@ define(function(require, module, exports) {
         }
         
         function open(options, callback) {
+            callback = callback || function() {};
+            
             var path = options.path = util.normalizePath(options.path);
             var type = options.editorType;
             var editor;
@@ -1889,7 +1892,7 @@ define(function(require, module, exports) {
              * @param {String}   [options.value]         The contents of the file
              * @param {String}   [options.title]         The title of the tab
              * @param {String}   [options.tooltip]       The tooltip at the button of the tab
-             * @param {Function} callback 
+             * @param {Function} [callback]
              * @param {Error}    callback.err            An error that might 
              *   occur during the load of the file contents.
              * @param {Tab}      callback.tab            The created tab.