diff --git a/ext/bg/options-form.js b/ext/bg/options-form.js
new file mode 100644
index 00000000..cde0ea62
--- /dev/null
+++ b/ext/bg/options-form.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+$('#saveOptions').click(() => {
+    saveOptions(sanitizeOptions(formToOptions()))
+});
+
+$('#resetOptions').click(() => {
+    if (confirm('Reset options to defaults?')) {
+        optionsToForm(sanitizeOptions({}));
+    }
+});
+
+function optionsToForm(opts) {
+    $('#scanLength').val(opts.scanLength);
+}
+
+function formToOptions() {
+    return {
+        scanLength: $('#scanLength').val()
+    };
+}
+
+$(document).ready(() => {
+    loadOptions((opts) => optionsToForm(sanitizeOptions(opts)));
+});
diff --git a/ext/bg/options.html b/ext/bg/options.html
index e003fef9..7854fd86 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -27,27 +27,7 @@
             <script src="lib/jquery-2.2.2.min.js"></script>
             <script src="lib/bootstrap-3.3.6-dist/js/bootstrap.min.js"></script>
             <script src="options.js"></script>
-
-            <script>
-                $('#saveOptions').click(() => saveOptions(sanitizeOptions(formToOptions())));
-                $('#resetOptions').click(() => {
-                    if (confirm('Reset options to defaults?')) {
-                        optionsToForm(sanitizeOptions({}));
-                    }
-                });
-
-                function optionsToForm(opts) {
-                    $('#scanLength').val(opts.scanLength);
-                }
-
-                function formToOptions() {
-                    return {
-                        scanLength: $('#scanLength').val()
-                    };
-                }
-
-                loadOptions((opts) => optionsToForm(sanitizeOptions(opts)));
-            </script>
+            <script src="options-form.js"></script>
         </div>
     </body>
 </html>
diff --git a/ext/manifest.json b/ext/manifest.json
index 4a893ceb..538d1d37 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -7,6 +7,7 @@
     "browser_action": {"default_icon": "icon.png"},
     "background":     {"page": "bg/background.html"},
     "options_page":   "bg/options.html",
+    "permissions":    [ "storage" ],
 
     "content_scripts": [{
         "matches": ["*://*/*"],