diff --git a/css/main.css b/css/main.css
index 7ce1d48..9b29874 100644
--- a/css/main.css
+++ b/css/main.css
@@ -152,3 +152,14 @@ body {
       color: black;
       text-decoration: none;
       cursor: pointer; }
+
+#settings-cog {
+  width: 48px;
+  height: 48px;
+  position: absolute;
+  bottom: 25px;
+  right: 25px; 
+}
+.cog:hover {
+    fill: white;
+  }
diff --git a/index.html b/index.html
index 7178528..1c7312d 100644
--- a/index.html
+++ b/index.html
@@ -35,6 +35,9 @@
         </div>
         <div id="other-content">
         </div>
+        <svg viewBox="0 0 24 24" id="settings-cog">
+          <path class="cog" fill="#6F6F6F" ng-attr-d="{{icon.data}}" d="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z"></path>
+        </svg>
     </div>
     <!--JSON Editor-->
     <script src="js/jsoneditor.min.js"></script>
@@ -43,4 +46,4 @@
     <script src="js/autocomplete.js"></script>
     <script src="js/main.js"></script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/js/main.js b/js/main.js
index f0b3ccf..a2e9876 100644
--- a/js/main.js
+++ b/js/main.js
@@ -79,7 +79,7 @@ function initSearchBar(jsonData) {
         query = document.getElementById(searchBarId).value
 
         // Open settings
-        if (query == "--setting") {
+        if (query == "--setting" || query == "--settings") {
             showSettings()
             document.getElementById(searchBarId).value = ""
             // Remove the autocomplete boxes
@@ -392,7 +392,6 @@ function extractQuickLinks(passedSqrs) {
     autocomplete(document.getElementById("search-bar-input"), this.validQuickLinks);
 }
 
-
 // Listen to key click
 
 function listenForSettings() {
diff --git a/js/settings.js b/js/settings.js
index 6926384..7936538 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -14,6 +14,10 @@ jsonContainer = "jsoneditor"
 // Detect browser
 BROWSER = detectBrowser()
 
+document.getElementById('settings-cog').onclick = function() {
+  showSettings()
+}
+
 function showSettings() {
     modalEl = document.getElementById(modalId)
     closeBtn = document.getElementsByClassName(closeId)[0]
@@ -36,6 +40,14 @@ function showSettings() {
         document.getElementById(jsonContainer).innerHTML = ""
         location.reload()
     }
+    document.getElementById('settings-cog').onclick = () => {
+        modalEl.style.display = "none"
+        // Get the updated JSON
+        updatedJson = editor.get()
+        BROWSER.storage.sync.set(updatedJson)
+        document.getElementById(jsonContainer).innerHTML = ""
+        location.reload()
+    }
 }
 
 async function loadJson(editor) {
@@ -47,7 +59,7 @@ async function loadJson(editor) {
         // Populate the editor
         editor.set(result)
     })
-}
+};
 
 function detectBrowser() {
     // Firefox
@@ -56,5 +68,5 @@ function detectBrowser() {
     else if (!!window.chrome && (!!window.chrome.webstore || !!window.chrome.runtime))
         BROWSER = chrome
 
-    return BROWSER
-}
\ No newline at end of file
+    return BROWSER;
+};