diff --git a/CHANGELOG b/CHANGELOG
index 91a9b6e1f..e7128e841 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix service not available error when pressing back from compose dialog (#1485552)
 - Fix using mail() on Windows (#1485779)
 - Fix word wrapping in message-part's <PRE>s for printing (#1485787)
 - Fix incorrect word wrapping in outgoing plaintext multibyte messages (#1485714)
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index 5cc2a574d..d32e93996 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -19,6 +19,10 @@
 
 */
 
+if (!$OUTPUT->ajax_call) {
+  return;
+}
+
 // is there a sort type for this request?
 if ($sort = get_input_value('_sort', RCUBE_INPUT_GET))
 {