diff --git a/www/code/main.js b/www/code/main.js
index 4f6b087dd..4c28fe58e 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -253,19 +253,21 @@ define([
                     var clike = /^\s*(\/\*|\/\/)(.*)?(\*\/)*$/;
                     if (clike.test(line)) {
                         line.replace(clike, function (a, one, two) {
-                            if (!two && two.replace) { return; }
+                            if (!(two && two.replace)) { return; }
                             text = two.replace(/\*\/\s*$/, '').trim();
                         });
                         return true;
                     }
+
+                    // TODO make one more pass for multiline comments
                 });
 
                 return text.trim();
             };
 
-            var suggestName = function () {
+            var suggestName = function (fallback) {
                 if (document.title === defaultName) {
-                    return getHeadingText() || "";
+                    return getHeadingText() || fallback || "";
                 } else {
                     return document.title || getHeadingText() || defaultName;
                 }
@@ -276,7 +278,7 @@ define([
 
                 var ext = Modes.extensionOf(module.highlightMode);
 
-                var title = Cryptpad.fixFileName(suggestName()) + ext;
+                var title = Cryptpad.fixFileName(suggestName('cryptpad')) + (ext || '.txt');
 
                 Cryptpad.prompt(Messages.exportPrompt, title, function (filename) {
                         if (filename === null) { return; }
diff --git a/www/pad/main.js b/www/pad/main.js
index 310a3d353..de3e2bcf9 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -321,9 +321,9 @@ define([
                 })) { return text; }
             };
 
-            var suggestName = function () {
+            var suggestName = function (fallback) {
                 if (document.title === defaultName) {
-                    return getHeadingText() || "";
+                    return getHeadingText() || fallback || "";
                 } else {
                     return document.title || getHeadingText() || defaultName;
                 }
@@ -510,7 +510,7 @@ define([
 
             var exportFile = function () {
                 var html = getHTML();
-                var suggestion = suggestName();
+                var suggestion = suggestName('cryptpad-document');
                 Cryptpad.prompt(Messages.exportPrompt,
                     Cryptpad.fixFileName(suggestion) + '.html', function (filename) {
                     if (!(typeof(filename) === 'string' && filename)) { return; }