diff --git a/public_html/lists/admin/actions/configure.php b/public_html/lists/admin/actions/configure.php
index 2cc09bc6e..0b2cca6e4 100644
--- a/public_html/lists/admin/actions/configure.php
+++ b/public_html/lists/admin/actions/configure.php
@@ -113,8 +113,14 @@
   $(".dontsavebutton").click(function() {
      item = $(this).attr(\'id\');
      item = item.replace(/dontsave/,\'\');
-     desc = $("#description"+item).html();
-     $("#"+item).html(desc+\' <i>' .str_replace("'", "\'", s('editing cancelled')).'</i>\');
+     itemEl = $("#"+item);
+     original = itemEl.data(\'original-html\');
+     if (original) {
+       itemEl.html(original);
+     } else {
+       desc = $("#description"+item).html();
+       itemEl.html(desc+\' <i>' .str_replace("'", "\'", s('editing cancelled')).'</i>\');
+     }
   });
 
 </script>';
diff --git a/public_html/lists/admin/js/phplistapp.js b/public_html/lists/admin/js/phplistapp.js
index 02c0dbe16..9086dc133 100644
--- a/public_html/lists/admin/js/phplistapp.js
+++ b/public_html/lists/admin/js/phplistapp.js
@@ -157,7 +157,7 @@ $(document).ready(function () {
         }
     });
 
-    $("a.ajaxable").on("click",function () {
+    $(document).on("click", "a.ajaxable", function () {
         var url = this.href;
         var thispage = urlParameter('page', window.location.href);
         if (thispage == "") {
@@ -168,6 +168,7 @@ $(document).ready(function () {
             url += '&action=' + thispage;
         }
         parent = $(this).parent();
+        parent.data('original-html', parent.html());
         parent.html(busyImage);
         url = url.replace(/page=/, 'origpage=');
         //  alert(url+'&ajaxed=true&page=pageaction');
diff --git a/public_html/lists/admin/ui/default/js/all.js b/public_html/lists/admin/ui/default/js/all.js
index 8e983c2d8..cb9d22920 100644
--- a/public_html/lists/admin/ui/default/js/all.js
+++ b/public_html/lists/admin/ui/default/js/all.js
@@ -1221,7 +1221,7 @@ $(document).ready(function () {
         $(this).parents('.note').hide();
     });
 
-    $("a.ajaxable").click(function () {
+    $(document).on("click", "a.ajaxable", function () {
         var url = this.href;
         var thispage = urlParameter('page', window.location.href);
         if (thispage == "") {
@@ -1232,6 +1232,7 @@ $(document).ready(function () {
             url += '&action=' + thispage;
         }
         parent = $(this).parent();
+        parent.data('original-html', parent.html());
         parent.html(busyImage);
         url = url.replace(/page=/, 'origpage=');
         //  alert(url+'&ajaxed=true&page=pageaction');
diff --git a/public_html/lists/admin/ui/default/js/all.min.js b/public_html/lists/admin/ui/default/js/all.min.js
index 8ae8f9555..f4108a478 100644
--- a/public_html/lists/admin/ui/default/js/all.min.js
+++ b/public_html/lists/admin/ui/default/js/all.min.js
@@ -67,9 +67,9 @@ $("#loadingprogressbanner").html(loadMessage+'<br/><br/>'+currentMessage);loadCo
 function openHelpDialog(url){$("#dialog").dialog({minHeight:400,width:600,modal:true});$("#dialog").html('<div class="openhelpimage">'+busyImage+'</div>');var destpage=urlParameter('page',url);url=url.replace(/page=/,'origpage=');$("#dialog").load(url+'&ajaxed=true&page=pageaction&action='+destpage);$(".ui-widget-overlay").click(function(){$("#dialog").dialog('close');});}
 function initialiseTranslation(text){$("#dialog").dialog({minHeight:400,width:600,modal:true});$("#dialog").html('<div class="openhelpimage">'+text+'<br/>'+busyImage+'</div>');$("#dialog").load('./?ajaxed=true&page=pageaction&action=initlanguage');}
 function totalSentUpdate(msgid){$('#totalsent'+msgid).load('./?page=pageaction&ajaxed=true&action=msgsent&id='+msgid,"",function(){});setTimeout("totalSentUpdate("+msgid+")",5000);}
-$(document).ready(function(){$(".note .hide").click(function(){$(this).parents('.note').hide();});$("a.ajaxable").click(function(){var url=this.href;var thispage=urlParameter('page',window.location.href);if(thispage==""){thispage="home";}
+$(document).ready(function(){$(".note .hide").click(function(){$(this).parents('.note').hide();});$(document).on("click","a.ajaxable",function(){var url=this.href;var thispage=urlParameter('page',window.location.href);if(thispage==""){thispage="home";}
 var action=urlParameter('action',url);if(action==""){url+='&action='+thispage;}
-parent=$(this).parent();parent.html(busyImage);url=url.replace(/page=/,'origpage=');parent.load(url+'&ajaxed=true&page=pageaction');return false;});$("input:checkbox.checkallcheckboxes").click(function(){if(this.checked){$("input[type=checkbox]:not(:checked)").each(function(){this.checked=true;});}else{$("input[type=checkbox]:checked").each(function(){this.checked=false;});}});var stop=false;if($.fn.accordion){$(".accordion").accordion({autoHeight:false,navigation:true,collapsible:true});}
+parent=$(this).parent();parent.data('original-html',parent.html());parent.html(busyImage);url=url.replace(/page=/,'origpage=');parent.load(url+'&ajaxed=true&page=pageaction');return false;});$("input:checkbox.checkallcheckboxes").click(function(){if(this.checked){$("input[type=checkbox]:not(:checked)").each(function(){this.checked=true;});}else{$("input[type=checkbox]:checked").each(function(){this.checked=false;});}});var stop=false;if($.fn.accordion){$(".accordion").accordion({autoHeight:false,navigation:true,collapsible:true});}
 $(".opendialog").click(function(){openHelpDialog(this.href);return false;});$(".helpdialog").click(function(){openHelpDialog(this.href);return false;});$(".closedialog").click(function(){$("#dialog").dialog('close');});$("div.dropButton img.arrow").click(function(){submenu=$(this).parent().parent().find("div.submenu");if(submenu.css('display')=="block"){submenu.hide();$(this).attr('src',menuArrowImagesrc);}else{submenu.fadeIn();$(this).attr('src',menuArrowActiveImagesrc);}
 return false;});if($.fn.tabs){$(".tabbed").tabs({ajaxOptions:{error:function(xhr,status,index,anchor){$(anchor.hash).html("Error fetching page");}}});$(".tabbed1").tabs();}
 $("#subjectinput").focus(function(){if(this.value=='(no subject)'){this.value="";}})