diff --git a/css/converse.css b/css/converse.css
index 4625fd018..de6fc7416 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -44,6 +44,8 @@
   /* status dropdown styles */ }
   #conversejs ::selection {
     background-color: #E3C9C1; }
+  #conversejs ::-moz-selection {
+    background-color: #E3C9C1; }
   #conversejs *, #conversejs *:before, #conversejs *:after {
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
@@ -880,8 +882,6 @@
         white-space: nowrap; }
         #conversejs .chatroom .participant-list li.moderator {
           color: #8f2831; }
-        #conversejs .chatroom .participant-list li.visitor {
-          color: #A3A3A3; }
     #conversejs .chatroom .chat-textarea {
       border-bottom-right-radius: 0; }
     #conversejs .chatroom .chat-area {
diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index bc7e45abe..a2520fd03 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -11,6 +11,7 @@ Changelog
 * #357 Fix the known bug where a state notification reopens a chat box. [floriancargoet]
 * #358 Bugfix. Chat rooms show the same occupants bug. [floriancargoet]
 * #359 Fix a timeout bug in chat state notifications. [floriancargoet]
+* #364 Text selection in chat boxes not shown in Firefox. [jcbrand]
 
 0.9.1 (2015-03-26)
 ------------------
diff --git a/sass/converse.scss b/sass/converse.scss
index 02e184e3f..a7842f82b 100644
--- a/sass/converse.scss
+++ b/sass/converse.scss
@@ -34,10 +34,12 @@
 
 #conversejs {
   @import "variables";
-
   ::selection {
     background-color: $highlight-color;
   }
+  ::-moz-selection {
+    background-color: $highlight-color;
+  }
 
   color: $text-color;
   font-size: $font-size;