diff --git a/indra/newview/llfloaterautoreplacesettings.cpp b/indra/newview/llfloaterautoreplacesettings.cpp
index d455b685fd..6b91491dba 100644
--- a/indra/newview/llfloaterautoreplacesettings.cpp
+++ b/indra/newview/llfloaterautoreplacesettings.cpp
@@ -420,6 +420,14 @@ void LLFloaterAutoReplaceSettings::onNewList()
 bool LLFloaterAutoReplaceSettings::callbackNewListName(const LLSD& notification, const LLSD& response)
 {
 	LL_DEBUGS("AutoReplace")<<"called"<<LL_ENDL;
+
+	// <FS:Ansariel> FIRE-31256: Add Cancel button for new auto-replace list dialog
+	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+	if (option != 0)
+	{
+		return false;
+	}
+	// </FS:Ansariel>
 	
 	LLSD newList = notification["payload"]["list"];
 
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 9fc9152e5d..b54bf8e12c 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -1250,6 +1250,7 @@ Sie sind nicht berechtigt, Land für die aktive Gruppe zu kaufen.
 		Name für neue Liste:
 		<form name="form">
 			<button name="SetName" text="OK"/>
+			<button name="Cancel" text="Abbrechen"/>
 		</form>
 	</notification>
 	<notification label="Automatische Ersetzungsliste umbenennen" name="RenameAutoReplaceList">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index cd289d5c27..1ecfc62f4b 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3129,6 +3129,10 @@ Would you be my friend?
        index="0"
        name="SetName"
        text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
     </form>
   </notification>