diff --git a/chrome/content/zotero/longTagFixer.js b/chrome/content/zotero/longTagFixer.js
index 8e9bc3d86..5d70a9914 100644
--- a/chrome/content/zotero/longTagFixer.js
+++ b/chrome/content/zotero/longTagFixer.js
@@ -6,6 +6,9 @@ var Zotero_Long_Tag_Fixer = new function () {
 		document.getElementById('zotero-old-tag').value = _oldTag;
 		document.getElementById('zotero-old-tag-delimiter').nextSibling.value = 'character'; // TODO: localize
 		
+		var delimiter = Zotero.Prefs.get('lastLongTagDelimiter');
+		document.getElementById('zotero-old-tag-delimiter').value = delimiter;
+		
 		var lastMode = Zotero.Prefs.get('lastLongTagMode');
 		if (!lastMode) {
 			lastMode = 0;
@@ -23,6 +26,7 @@ var Zotero_Long_Tag_Fixer = new function () {
 			case 0:
 				var buttonLabel = "Save Tags";
 				this.updateTagList();
+				document.getElementById('zotero-old-tag-delimiter').select();
 				break;
 				
 			case 1:
@@ -54,7 +58,8 @@ var Zotero_Long_Tag_Fixer = new function () {
 		
 		var delimiter = document.getElementById('zotero-old-tag-delimiter').value;
 		if (delimiter) {
-			var re = new RegExp("\\s*" + delimiter + "\\s*");
+			Zotero.Prefs.set('lastLongTagDelimiter', delimiter);
+			var re = new RegExp("\\s*" + delimiter.replace(/([\.\-\[\]\(\)\?\*\+])/g, "\\$1") + "\\s*");
 			var tags = _oldTag.split(re);
 		}
 		
@@ -79,6 +84,8 @@ var Zotero_Long_Tag_Fixer = new function () {
 			li.setAttribute('type', 'checkbox');
 			li.setAttribute('checked', 'true');
 		}
+		
+		window.sizeToContent();
 	}
 	
 	
diff --git a/chrome/content/zotero/longTagFixer.xul b/chrome/content/zotero/longTagFixer.xul
index 768a9c3b2..13ab1ab64 100644
--- a/chrome/content/zotero/longTagFixer.xul
+++ b/chrome/content/zotero/longTagFixer.xul
@@ -37,7 +37,7 @@
 				<hbox align="center">
 					<label>Split at the </label>
 					<!--  // TODO: localize -->
-					<textbox id="zotero-old-tag-delimiter" size="1" value=";"
+					<textbox id="zotero-old-tag-delimiter" size="1"
 						oninput="this.nextSibling.value = this.value.length > 1  ? 'characters' : 'character'; Zotero_Long_Tag_Fixer.updateTagList();"/>
 					<label/>
 				</hbox>
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index 2fd17f46f..7e91fe065 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -43,6 +43,7 @@ pref("extensions.zotero.lastAbstractExpand",0);
 pref("extensions.zotero.lastRenameAssociatedFile", false);
 pref("extensions.zotero.lastViewedFolder", 'L');
 pref("extensions.zotero.lastLongTagMode", 0);
+pref("extensions.zotero.lastLongTagDelimiter", ";");
 
 //Tag Cloud
 pref("extensions.zotero.tagCloud", false);