diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index 647373b6d..62d2d8ef9 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -241,8 +241,8 @@ body .CodeMirror {
     background-color: #eeeeee
 }
 
-.CodeMirror pre.CodeMirror-placeholder { 
-    color: #999 !important; 
+.CodeMirror pre.CodeMirror-placeholder {
+    color: #999 !important;
 }
 
 #sql-console-query {
@@ -359,7 +359,9 @@ pre:not(.CodeMirror-line) {
 
 .go-to-selected-note-button.disabled, .go-to-selected-note-button.disabled:hover {
     cursor: inherit;
-    color: var(--button-disabled-background-color) !important;
+    color: var(--button-disabled-text-color) !important;
+    background-color: var(--button-disabled-background-color) !important;
+    text-decoration: none;
 }
 
 .note-autocomplete-input {
diff --git a/src/public/stylesheets/theme-dark.css b/src/public/stylesheets/theme-dark.css
index 00b0df5dd..5f2032601 100644
--- a/src/public/stylesheets/theme-dark.css
+++ b/src/public/stylesheets/theme-dark.css
@@ -21,10 +21,11 @@
     --more-accented-background-color: #777;
 
     --button-background-color: transparent;
-    --button-disabled-background-color: #222;
     --button-border-color: #ccc;
     --button-text-color: currentColor;
     --button-border-radius: 5px;
+    --button-disabled-background-color: transparent;
+    --button-disabled-text-color: #999;
 
     --primary-button-background-color: #888;
     --primary-button-text-color: white;
diff --git a/src/public/stylesheets/theme-light.css b/src/public/stylesheets/theme-light.css
index 113718989..50e8c5fb4 100644
--- a/src/public/stylesheets/theme-light.css
+++ b/src/public/stylesheets/theme-light.css
@@ -25,10 +25,11 @@ html {
     --more-accented-background-color: #ddd;
 
     --button-background-color: transparent;
-    --button-disabled-background-color: #ddd;
     --button-border-color: #ddd;
     --button-text-color: black;
     --button-border-radius: 5px;
+    --button-disabled-background-color: #ddd;
+    --button-disabled-text-color: black;
 
     --primary-button-background-color: #6c757d;
     --primary-button-text-color: white;