diff --git a/CHANGELOG b/CHANGELOG
index 9bc47e17e..7c3b86856 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ CHANGELOG Roundcube Webmail
 - Fix bug where message list columns could be in wrong order after column drag-n-drop and list sorting
 - Don't create multipart/alternative messages with empty text/plain part (#5283)
 - Wash position:fixed style in HTML mail for better security (#5264)
+- Fix error causing empty INBOX listing in Firefox when using an URL with user:password specified (#5400)
 
 RELEASE 1.1.5
 -------------
diff --git a/program/js/app.js b/program/js/app.js
index 062efffc9..128a1e309 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -7338,7 +7338,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