diff --git a/www/common/common-thumbnail.js b/www/common/common-thumbnail.js
index 4b9d7e595..89f381eea 100644
--- a/www/common/common-thumbnail.js
+++ b/www/common/common-thumbnail.js
@@ -25,6 +25,7 @@ define([
     ];
 
     Thumb.isSupportedType = function (file) {
+        if (!file) { return false; }
         var type = file.type;
         if (Util.isPlainTextFile(file.type, file.name)) {
             type = "text/plain";
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index f6527bf26..208396d34 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -9,12 +9,11 @@ define([
     '/common/outer/local-store.js',
     '/common/outer/worker-channel.js',
     '/common/outer/login-block.js',
-    '/file/file-crypto.js',
 
     '/customize/application_config.js',
     '/bower_components/nthen/index.js',
 ], function (Config, Messages, Util, Hash,
-            Messaging, Constants, Feedback, LocalStore, Channel, Block, FileCrypto,
+            Messaging, Constants, Feedback, LocalStore, Channel, Block,
             AppConfig, Nthen) {
 
 /*  This file exposes functionality which is specific to Cryptpad, but not to
@@ -588,9 +587,11 @@ define([
                 u8 = _u8;
             }));
         }).nThen(function (waitFor) {
-            FileCrypto.decrypt(u8, key, waitFor(function (err, _res) {
-                if (err || !_res.content) { return void waitFor.abort(); }
-                res = _res;
+            require(["/file/file-crypto.js"], waitFor(function (FileCrypto) {
+                FileCrypto.decrypt(u8, key, waitFor(function (err, _res) {
+                    if (err || !_res.content) { return void waitFor.abort(); }
+                    res = _res;
+                }));
             }));
         }).nThen(function (waitFor) {
             var ext = Util.parseFilename(data.title).ext;
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 588c2bfad..a8283c9f3 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -814,7 +814,7 @@ define([
             });
 
             sframeChan.on('Q_GET_FILE_THUMBNAIL', function (data, cb) {
-                if (!Cryptpad.fromFileData.href) {
+                if (!Cryptpad.fromFileData || !Cryptpad.fromFileData.href) {
                     return void cb({
                         error: "EINVAL",
                     });
diff --git a/www/drive/inner.js b/www/drive/inner.js
index c6fdc6067..baafae0f4 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -319,7 +319,7 @@ define([
                 h('li', h('a.cp-app-drive-context-openincode.dropdown-item', {
                     'tabindex': '-1',
                     'data-icon': faOpenInCode,
-                }, Messages.fc_openInCode || "Open in Code")),
+                }, Messages.fc_openInCode || "Open in Code")), // XXX
                 $separator.clone()[0],
                 h('li', h('a.cp-app-drive-context-expandall.dropdown-item', {
                     'tabindex': '-1',
@@ -1014,6 +1014,7 @@ define([
                     }
                     if (!$element.is('.cp-border-color-file')) {
                         hide.push('download');
+                        hide.push('openincode');
                     }
                     if ($element.is('.cp-app-drive-element-file')) {
                         // No folder in files
@@ -1027,13 +1028,9 @@ define([
                         // if it's not a plain text file
                         var isPlainTextFile = false;
                         var metadata = manager.getFileData(manager.find(path));
-                        if (metadata) {
-                            var href = metadata.roHref || metadata.href;
-                            if (href && Hash.parsePadUrl(href).type === "file") {
-                                isPlainTextFile = Util.isPlainTextFile(metadata.fileType, metadata.title);
-                            }
+                        if (!metadata || !Util.isPlainTextFile(metadata.fileType, metadata.title)) {
+                            hide.push('openincode');
                         }
-                        if (!isPlainTextFile) { hide.push('openincode'); }
                     } else if ($element.is('.cp-app-drive-element-sharedf')) {
                         if (containsFolder) {
                             // More than 1 folder selected: cannot create a new subfolder
@@ -1090,6 +1087,7 @@ define([
                     hide.push('openparent');
                     hide.push('hashtag');
                     hide.push('download');
+                    hide.push('openincode'); // can't because of race condition
                 }
                 if (containsFolder && paths.length > 1) {
                     // Cannot open multiple folders
@@ -3543,21 +3541,21 @@ define([
                 });
             }
             else if ($(this).hasClass('cp-app-drive-context-openincode')) {
-                paths.forEach(function (p) {
-                    var el = manager.find(p.path);
-                    var metadata = manager.getFileData(el);
-                    var simpleData = {
-                        title: metadata.filename || metadata.title,
-                        href: metadata.href,
-                        password: metadata.password,
-                        channel: metadata.channel,
-                    };
-                    nThen(function (waitFor) {
-                        common.sessionStorage.put(Constants.newPadFileData, JSON.stringify(simpleData), waitFor());
-                        common.sessionStorage.put(Constants.newPadPathKey, currentPath, waitFor());
-                    }).nThen(function () {
-                        common.openURL('/code/');
-                    });
+                if (paths.length !== 1) { return; }
+                var p = paths[0];
+                var el = manager.find(p.path);
+                var metadata = manager.getFileData(el);
+                var simpleData = {
+                    title: metadata.filename || metadata.title,
+                    href: metadata.href,
+                    password: metadata.password,
+                    channel: metadata.channel,
+                };
+                nThen(function (waitFor) {
+                    common.sessionStorage.put(Constants.newPadFileData, JSON.stringify(simpleData), waitFor());
+                    common.sessionStorage.put(Constants.newPadPathKey, currentPath, waitFor());
+                }).nThen(function () {
+                    common.openURL('/code/');
                 });
             }
             else if ($(this).hasClass('cp-app-drive-context-expandall') ||