diff --git a/src/popup/app/tools/toolsExportController.js b/src/popup/app/tools/toolsExportController.js
index 43117b3f..b435f749 100644
--- a/src/popup/app/tools/toolsExportController.js
+++ b/src/popup/app/tools/toolsExportController.js
@@ -67,9 +67,23 @@
                         password: decLogins[i].password,
                         notes: decLogins[i].notes,
                         folder: null,
-                        totp: decLogins[i].totp
+                        totp: decLogins[i].totp,
+                        fields: null
                     };
 
+                    if (decLogins[i].fields) {
+                        for (var j = 0; j < decLogins[i].fields.length; j++) {
+                            if (!login.fields) {
+                                login.fields = '';
+                            }
+                            else {
+                                login.fields += '\n';
+                            }
+
+                            login.fields += (decLogins[i].fields[j].name + ': ' + decLogins[i].fields[j].value);
+                        }
+                    }
+
                     for (var j = 0; j < decFolders.length; j++) {
                         if (decFolders[j].id === decLogins[i].folderId && decFolders[j].name !== i18nService.noneFolder) {
                             login.folder = decFolders[j].name;