diff --git a/apps/bookmarks/bookmarksHelper.php b/apps/bookmarks/bookmarksHelper.php
index 01b551111e0b8e5a50f6101b4908e0e7286ce607..92baac2f5114ba3d3d32e8d239b9e48dd74031af 100644
--- a/apps/bookmarks/bookmarksHelper.php
+++ b/apps/bookmarks/bookmarksHelper.php
@@ -90,7 +90,8 @@ function addBookmark($url, $title, $tags='') {
 	
 	if(empty($title)) {
 		$metadata = getURLMetadata($url);
-		$title = $metadata['title'];
+		if(isset($metadata['title'])) // Check for problems fetching the title
+			$title = $metadata['title'];
 	}
 	
 	if(empty($title)) {
diff --git a/apps/bookmarks/templates/addBm.php b/apps/bookmarks/templates/addBm.php
index 534bafe58859d38e1870d050abc0c1ef2a069813..357e0a18f25f35514abab914f87910c8f37e5e78 100644
--- a/apps/bookmarks/templates/addBm.php
+++ b/apps/bookmarks/templates/addBm.php
@@ -6,5 +6,6 @@
   </head>
   <body>
   	<div class="message"><h1>Saved!</h1></div>
+		<a href="javascript:self.close()" >Close the window</a>
   </body>  
 </html>  
\ No newline at end of file