diff --git a/package.json b/package.json
index 6fe0f4ba..63f31c24 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
         "c9.ide.find.infiles": "#72582de3cd",
         "c9.ide.find.replace": "#e4daf722b8",
         "c9.ide.run.debug": "#638e6b00b3",
-        "c9.automate": "#b1b0cca13a",
+        "c9.automate": "#3e6927aa96",
         "c9.ide.ace.emmet": "#e5f1a92ac3",
         "c9.ide.ace.gotoline": "#4d1a93172c",
         "c9.ide.ace.keymaps": "#43445d6306",
diff --git a/plugins/c9.ide.plugins/loader.js b/plugins/c9.ide.plugins/loader.js
index 93ad2aea..7b21a959 100644
--- a/plugins/c9.ide.plugins/loader.js
+++ b/plugins/c9.ide.plugins/loader.js
@@ -57,8 +57,11 @@ define(function(require, exports, module) {
             if (loadFromDisk) {
                 fs.readdir("~/.c9/plugins", function handle(err, files){
                     if (err) {
-                        if (err.code == "EDISCONNECT")
-                            fs.readdir("~/.c9/plugins", handle);
+                        if (err.code == "EDISCONNECT") {
+                            c9.once("connect", function(){
+                                fs.readdir("~/.c9/plugins", handle);
+                            });
+                        }
                         console.error(err);
                         return;
                     }