diff --git a/res/css/_common.scss b/res/css/_common.scss
index cd2b0c09cd..8d18eac931 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -62,6 +62,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 /* Required by Firefox */
 textarea {
     font-family: $font-family;
+    color: $primary-fg-color;
 }
 
 /* Prevent ugly dotted highlight around selected elements in Firefox */
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 6782322cbe..63aff91806 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -31,6 +31,9 @@ $preview-bar-bg-color: $header-panel-bg-color;
 
 $tagpanel-bg-color: $base-color;
 
+// used by AddressSelector
+$selected-color: $room-highlight-color;
+
 // selected for hoverover & selected event tiles
 $event-selected-color: $search-bg-color;