diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php
index e1de0d445..13597d4ca 100755
--- a/forms/HtmlEditorField.php
+++ b/forms/HtmlEditorField.php
@@ -171,6 +171,9 @@ class HtmlEditorField extends TextareaField {
 			}
 			// $imageTracking->destroy();
 		}
+		
+		// Sometimes clients will double-escape %20.  Fix this up with this dirty hack
+		$content = str_replace('%2520', '%20', $content);
 			
 		$record->$fieldName = $content;
 	}