--- a/toolkit/components/satchel/.eslintrc.js
+++ b/toolkit/components/satchel/.eslintrc.js
@@ -50,10 +50,11 @@ module.exports = {
     }],
     "no-throw-literal": "error",
     "padded-blocks": ["error", "never"],
     radix: "error",
     "array-bracket-spacing": ["error", "never"],
     "space-in-parens": ["error", "never"],
     "comma-dangle": ["error", "always-multiline"],
     "dot-notation": "error",
+    "semi-spacing": ["error", {"before": false, "after": true}],
   },
 };

--- a/toolkit/components/satchel/FormHistory.jsm
+++ b/toolkit/components/satchel/FormHistory.jsm
@@ -353,17 +353,17 @@ function makeMoveToDeletedStatement(aGui
   return null;
 }
 
 function generateGUID() {
   // string like: "{f60d9eac-9421-4abc-8491-8e8322b063d4}"
   let uuid = uuidService.generateUUID().toString();
   let raw = ""; // A string with the low bytes set to random values
   let bytes = 0;
-  for (let i = 1; bytes < 12 ; i += 2) {
+  for (let i = 1; bytes < 12; i += 2) {
     // Skip dashes
     if (uuid[i] == "-") {
       i++;
     }
     let hexVal = parseInt(uuid[i] + uuid[i + 1], 16);
     raw += String.fromCharCode(hexVal);
     bytes++;
   }