diff --git a/package-lock.json b/package-lock.json
index 7ca0e98f..cbdc9084 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nighttab",
-  "version": "4.13.0",
+  "version": "4.13.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cc091e7d..1467557c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nighttab",
-  "version": "4.13.0",
+  "version": "4.13.1",
   "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
   "main": "index.js",
   "scripts": {
diff --git a/src/js/control.js b/src/js/control.js
index 25645d60..242e95d2 100644
--- a/src/js/control.js
+++ b/src/js/control.js
@@ -2542,6 +2542,7 @@ var control = (function() {
     path: "theme.custom.edit",
     type: "checkbox",
     func: function() {
+      theme.render.custom.tabIndex();
       render.class();
     }
   }, {
diff --git a/src/js/theme.js b/src/js/theme.js
index db4c1817..ef177dba 100644
--- a/src/js/theme.js
+++ b/src/js/theme.js
@@ -2,7 +2,6 @@ var theme = (function() {
 
   var _timerFontDisplay = null;
   var _timerFontUi = null;
-  var _customThemeEdit = false;
 
   var stagedThemeCustom = {
     position: {
@@ -1724,17 +1723,13 @@ var theme = (function() {
       };
     },
     tabIndex: function() {
-      if (_customThemeEdit) {
+      if (state.get.current().theme.custom.edit && state.get.current().menu) {
         helper.eA(".theme-custom-control-item").forEach(function(arrayItem, index) {
-          if (arrayItem.tabIndex == -2) {
-            arrayItem.tabIndex = 1;
-          };
+          arrayItem.tabIndex = 1;
         });
       } else {
         helper.eA(".theme-custom-control-item").forEach(function(arrayItem, index) {
-          if (arrayItem.tabIndex == 1) {
-            arrayItem.tabIndex = -2;
-          };
+          arrayItem.tabIndex = -2;
         });
       };
     }
@@ -1791,6 +1786,7 @@ var theme = (function() {
     style.check();
     accent.random();
     mod.accent.random();
+    mod.custom.close();
     render.font.display.name();
     render.font.display.weight();
     render.font.display.style();
diff --git a/src/js/version.js b/src/js/version.js
index cb771fdf..17f35851 100644
--- a/src/js/version.js
+++ b/src/js/version.js
@@ -1,6 +1,6 @@
 var version = (function() {
 
-  var current = "4.13.0";
+  var current = "4.13.1";
 
   var name = "Naughty Goose";
 
diff --git a/src/manifest.json b/src/manifest.json
index bc4aaa9a..0d173cd0 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,7 +2,7 @@
   "name": "nightTab",
   "short_name": "nightTab",
   "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
-  "version": "4.13.0",
+  "version": "4.13.1",
   "manifest_version": 2,
   "chrome_url_overrides": {
     "newtab": "index.html"