diff --git a/include/bbcode.php b/include/bbcode.php
index d461b9848..1da9bf1d2 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -191,7 +191,7 @@ function bb_cleanup_share($shared, $plaintext, $nolink) {
 	if (isset($bookmark[1][0]))
 		$link = $bookmark[1][0];
 
-	if (($title != "") AND (strpos($title, $shared[1]) !== false))
+	if (($shared[1] != "") AND (strpos($title, $shared[1]) !== false))
 		$shared[1] = $title;
 
 	if (($title != "") AND ((strpos($shared[1],$title) !== false) OR
diff --git a/library/markdown.php b/library/markdown.php
index 271d2e36c..83082f7ca 100644
--- a/library/markdown.php
+++ b/library/markdown.php
@@ -2,6 +2,11 @@
 require_once("library/parsedown/Parsedown.php");
 
 function Markdown($text) {
+
+	// Bugfix for the library:
+	// "[Title](http://domain.tld/ )" isn't handled correctly
+	$text = preg_replace("/\[(.*?)\]\s*?\(\s*?(\S*?)\s*?\)/ism", '[$1]($2)', $text);
+
 	$Parsedown = new Parsedown();
 	return($Parsedown->text($text));
 }