diff --git a/code/pages/WikiPage.php b/code/pages/WikiPage.php
index <HASH>..<HASH> 100644
--- a/code/pages/WikiPage.php
+++ b/code/pages/WikiPage.php
@@ -258,12 +258,23 @@ class WikiPage extends Page
 			include_once SIMPLEWIKI_DIR.'/thirdparty/htmlpurifier-4.0.0-lite/library/HTMLPurifier.auto.php';
 			$purifier = new HTMLPurifier();
 			$content = $purifier->purify($content);
+			$content = preg_replace_callback('/\%5B(.*?)\%5D/', array($this, 'reformatShortcodes'), $content);
 		}
 
 		return $content;
 	}
 
 	/**
+	 * Reformats shortcodes after being run through htmlpurifier
+	 *
+	 * @param array $matches
+	 */
+	public function reformatShortcodes($matches) {
+		$val = urldecode($matches[1]);
+		return '['.$val.']';
+	}
+
+	/**
 	 * Get the root of the wiki that this wiki page exists in
 	 *
 	 * @return WikiPage
BUGFIX: Convert purified shortcodes back to what they once were