diff --git a/components/com_content/models/form.php b/components/com_content/models/form.php
index 37ca1c5bb38ee..d049b8fd83859 100644
--- a/components/com_content/models/form.php
+++ b/components/com_content/models/form.php
@@ -130,6 +130,6 @@ public function getItem($itemId = null)
 	 */
 	public function getReturnPage()
 	{
-		return base64_encode(urldecode($this->getState('return_page')));
+		return base64_encode(urlencode($this->getState('return_page')));
 	}
 }