diff --git a/www/common/boot2.js b/www/common/boot2.js
index 76ce9bcf9..64d4bd71d 100644
--- a/www/common/boot2.js
+++ b/www/common/boot2.js
@@ -20,5 +20,16 @@ define([], function () {
         };
     }
 
+    if (!localStorage || typeof(localStorage.getItem) !== 'function') {
+        require('jquery', function ($) {
+            $.ajax({
+                type: 'HEAD',
+                url: '/common/feedback.html?NO_LOCALSTORAGE=' + (+new Date()),
+            });
+        });
+        window.alert("CryptPad needs localStorage to work, try a different browser");
+        return;
+    }
+
     require([document.querySelector('script[data-bootload]').getAttribute('data-bootload')]);
 });
diff --git a/www/drive/main.js b/www/drive/main.js
index dc5ae5842..bcba56df6 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -2689,7 +2689,7 @@ define([
                 if (err) { return void logError(err); }
                 $leftside.html('');
                 $leftside.append($limitContainer);
-            });
+            }, true);
 
             /* add a history button */
             var histConfig = {