diff --git a/resources/classes/text.php b/resources/classes/text.php
index 058320440c..dd0577e8d7 100644
--- a/resources/classes/text.php
+++ b/resources/classes/text.php
@@ -185,12 +185,12 @@ class text {
 	}
 
 	private function escape_str($string = '') {
-		//remove \' otherwise we end up with a double escape
-			return preg_replace("/\\\'/", "'", $string);
 		//perform initial escape
-			$string = addslashes($string);
-		//swap \' back otherwise we end up with a double escape
+			$string = addslashes(stripslashes($string));
+		//swap \' as we don't need to escape those
 			return preg_replace("/\\\'/", "'", $string);
+		//escape " as we write our strings double quoted
+			return preg_replace("/\"/", '\"', $string);
 	}
 }