diff --git a/src/css/hues-editor.css b/src/css/hues-editor.css
index aafe324..70f57c5 100644
--- a/src/css/hues-editor.css
+++ b/src/css/hues-editor.css
@@ -70,6 +70,7 @@
     align-items: center;
     position: absolute;
     margin-top: 4px;
+    margin-left: -4px;
 }
 
 #edit-timelock:before { 
@@ -92,10 +93,9 @@
 #edit-timelock > .hues-button {
     /* because of the pseudo element this one can't be transparent */
     background-color: rgb(171,171,171) !important;
-
 }
     
-#edit-timelock:hover > .hues-button {
+#edit-timelock > .hues-button:hover {
     background-color: rgb(236,236,236) !important;
 }
 
diff --git a/src/js/HuesSettings.js b/src/js/HuesSettings.js
index 4ade8b6..4bfcb6d 100644
--- a/src/js/HuesSettings.js
+++ b/src/js/HuesSettings.js
@@ -261,12 +261,13 @@ HuesSettings.prototype.connectCore = function(core) {
 };
 
 HuesSettings.prototype.show = function() {
-    if(this.core)
+    if(this.core) {
         this.core.hideLists();
+        if(this.core.editor)
+            this.core.editor.resize();
+    }
     this.window.style.display = "-webkit-flex";
     this.window.style.display = "flex";
-    if(this.core.editor)
-        this.core.editor.resize();
 };
 
 HuesSettings.prototype.hide = function() {