diff --git a/CHANGELOG b/CHANGELOG
index da4c36c99e7..493f9ce1cfe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -48,6 +48,7 @@ CHANGELOG Roundcube Webmail
 - Fix bug where names of downloaded files could be malformed when derived from the message subject (#5404)
 - Fix so "All" messages selection is resetted on search reset (#5413)
 - Fix bug where folder creation could fail if personal namespace contained more than one entry (#5403)
+- Fix error causing empty INBOX listing in Firefox when using an URL with user:password specified (#5400)
 
 RELEASE 1.2.1
 -------------
diff --git a/program/js/app.js b/program/js/app.js
index b8fb81682b3..0c86e36f668 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -8055,7 +8055,11 @@ function rcube_webmail()
   this.update_state = function(query)
   {
     if (window.history.replaceState)
-      window.history.replaceState({}, document.title, rcmail.url('', query));
+      try {
+        // This may throw security exception in Firefox (#5400)
+        window.history.replaceState({}, document.title, rcmail.url('', query));
+      }
+      catch(e) { /* ignore */ };
   };
 
   // send a http request to the server