diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index d8757cc46..7bc35f7e4 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -1208,7 +1208,10 @@ define(function () {
     out.chrome68 = "Il semblerait que vous utilisiez le navigateur Chrome version 68. Ce navigateur contient un bug rendant certaines pages entièrement blanches après quelques secondes ou bloquant les clics. Pour corriger ce problème, vous pouvez vous déplacer vers un nouvel onglet et revenir ou vous pouvez essayer de faire défiler la page. Ce bug devrait être corrigé dans la prochaine version du navigateur.";
 
     // Manual pad storage popup
-    out.autostore_notstored = "Ce pad n'est pas dans votre CryptDrive. Souhaitez-vous le stocker ?";
+    out.autostore_file = "fichier";
+    out.autostore_sf = "dossier";
+    out.autostore_pad = "pad";
+    out.autostore_notstored = "Ce {0} n'est pas dans votre CryptDrive. Souhaitez-vous le stocker ?";
     out.autostore_settings = "Vous pouvez activer le stockage automatique des pads dans vos <a href=\"/settings/\">Préférences</a> !";
     out.autostore_store = "Stocker";
     out.autostore_hide = "Ne pas stocker";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 5b660d0eb..8a9efc9ec 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -1258,7 +1258,10 @@ define(function () {
     out.chrome68 = "It seems that you're using the browser Chrome or Chromium version 68. It contains a bug resulting in the page turning completely white after a few seconds or the page being unresponsive to clicks. To fix this issue, you can switch to another tab and come back, or try to scroll in the page. This bug should be fixed in the next version of your browser.";
 
     // Manual pad storage popup
-    out.autostore_notstored = "This pad is not in your CryptDrive. Do you want to store it now?";
+    out.autostore_file = "file";
+    out.autostore_sf = "folder";
+    out.autostore_pad = "pad";
+    out.autostore_notstored = "This {0} is not in your CryptDrive. Do you want to store it now?";
     out.autostore_settings = "You can enable automatic pad storage in your <a href=\"/settings/\">Settings</a> page!";
     out.autostore_store = "Store";
     out.autostore_hide = "Don't store";
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 2929b17d5..1bd010aca 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -887,7 +887,7 @@ define([
         var popup = h('div.cp-corner-container', [
             minimize,
             maximize,
-            h('div.cp-corner-filler', { style: "width:130px;" }),
+            h('div.cp-corner-filler', { style: "width:120px;" }),
             h('div.cp-corner-filler', { style: "width:90px;" }),
             h('div.cp-corner-filler', { style: "width:60px;" }),
             h('div.cp-corner-filler', { style: "width:40px;" }),
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 3422ef6c8..41caf857f 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2382,8 +2382,12 @@ define([
         if (storePopupState) { return; }
         storePopupState = true;
         if (data && data.stored) { return; } // We won't display the popup for dropped files
+        var priv = common.getMetadataMgr().getPrivateData();
 
-        var text = Messages.autostore_notstored;
+        var typeMsg = priv.pathname.indexOf('/file/') !== -1 ? Messages.autostore_file :
+                        priv.pathname.indexOf('/drive/') !== -1 ? Messages.autostore_sf :
+                          Messages.autostore_pad;
+        var text = Messages._getKey('autostore_notstored', [typeMsg]);
         var footer = Messages.autostore_settings;
 
         var hide = h('button.cp-corner-cancel', Messages.autostore_hide);