diff --git a/ts/editor-toolbar/ButtonDropdown.svelte b/ts/editor-toolbar/ButtonDropdown.svelte
index 1cf83c43b..9d96d8654 100644
--- a/ts/editor-toolbar/ButtonDropdown.svelte
+++ b/ts/editor-toolbar/ButtonDropdown.svelte
@@ -3,8 +3,6 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import { getContext } from "svelte";
-    import { nightModeKey } from "./contextKeys";
     import type { ToolbarItem } from "./types";
     import ButtonGroup from "./ButtonGroup.svelte";
 
@@ -12,18 +10,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let className = "";
 
     function extendClassName(className: string): string {
-        return `dropdown-menu py-1 mb-0 ${
-            nightMode ? "btn-dropdown-menu--night-mode " : ""
-        }${className}`;
+        return `dropdown-menu btn-dropdown-menu py-1 mb-0 ${className}`;
     }
 
     export let buttons: ToolbarItem[];
-
-    const nightMode = getContext(nightModeKey);
 </script>
 
 <style>
-    :global(.btn-dropdown-menu--night-mode) {
+    :global(.btn-dropdown-menu) {
         background-color: var(--window-bg);
         border-color: var(--medium-border);
     }
diff --git a/ts/editor-toolbar/DropdownItem.svelte b/ts/editor-toolbar/DropdownItem.svelte
index 0d5baaa8b..21cce2d19 100644
--- a/ts/editor-toolbar/DropdownItem.svelte
+++ b/ts/editor-toolbar/DropdownItem.svelte
@@ -23,6 +23,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     button {
         display: flex;
         justify-content: space-between;
+    }
+
+    .btn-day {
+        color: black;
 
         &:active {
             background-color: button.$focus-color;
@@ -30,10 +34,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         }
     }
 
-    .btn-day {
-        color: black;
-    }
-
     .btn-night {
         color: white;
 
@@ -41,6 +41,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         &:focus {
             @include button.btn-night-base;
         }
+
+        &:active {
+            background-color: button.$focus-color;
+            color: white;
+        }
     }
 
     span {