From 1d85b397c9b73a8a7fa5563f2b97d5904b5af84d Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sun, 14 Jan 2018 09:01:23 +0900
Subject: [PATCH 1/2] fix default settings

---
 src/shared/settings/default.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/shared/settings/default.js b/src/shared/settings/default.js
index 0c3f0d9..bcd7731 100644
--- a/src/shared/settings/default.js
+++ b/src/shared/settings/default.js
@@ -60,9 +60,9 @@ export default {
       "duckduckgo": "https://duckduckgo.com/?q={}",
       "twitter": "https://twitter.com/search?q={}",
       "wikipedia": "https://en.wikipedia.org/w/index.php?search={}"
-    },
-    "properties": {
     }
+  },
+  "properties": {
   }
 }`,
 };

From 930cd14ac1b5d25bad28084bfa953ac4a13080d1 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sun, 14 Jan 2018 09:04:30 +0900
Subject: [PATCH 2/2] fix default propertiest

---
 src/shared/settings/storage.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/shared/settings/storage.js b/src/shared/settings/storage.js
index 1edb441..25ebfcd 100644
--- a/src/shared/settings/storage.js
+++ b/src/shared/settings/storage.js
@@ -18,7 +18,9 @@ const loadValue = () => {
     } else if (settings.source === 'form') {
       value = settingsValues.valueFromForm(settings.form);
     }
-    return value;
+    return Object.assign({},
+      settingsValues.valueFromJson(DefaultSettings.json),
+      value);
   });
 };