diff --git a/bookmarksHelper.php b/bookmarksHelper.php
index 8def7401..7ada6901 100644
--- a/bookmarksHelper.php
+++ b/bookmarksHelper.php
@@ -71,7 +71,7 @@ function getURLMetadata($url) {
 	return $metadata;
 }
 
-function addBookmark($url, $title='', $tags='') {
+function addBookmark($url, $title, $tags='') {
 	$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
 	if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
 		$_ut = "strftime('%s','now')";
@@ -93,6 +93,11 @@ function addBookmark($url, $title='', $tags='') {
 		$title = $metadata['title'];
 	}
 	
+	if(empty($title)) {
+		$l = new OC_L10N('bookmarks');
+		$title = $l->t('unnamed');
+	}
+	
 	$params=array(
 	htmlspecialchars_decode($url),
 	htmlspecialchars_decode($title),
diff --git a/js/bookmarks.js b/js/bookmarks.js
index fa5adde2..9502af0a 100644
--- a/js/bookmarks.js
+++ b/js/bookmarks.js
@@ -9,9 +9,7 @@ $(document).ready(function() {
 		fillWindow($('.bookmarks_list'));
 	});
 	$(window).resize();
-	$($('.bookmarks_list')).scroll(updateOnBottom);
-	
-	$('.bookmarks_list').empty();
+	$('.bookmarks_list').scroll(updateOnBottom).empty().width($('#content').width());
 	getBookmarks();
 });
 
@@ -145,7 +143,7 @@ function updateBookmarksList(bookmark) {
 			'<p class="bookmark_title">'+
 				'<a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' +
 			'</p>' +
-			'<p class="bookmark_url">' + encodeEntities(bookmark.url) + '</p>' +
+			'<p class="bookmark_url"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.url) + '</a></p>' +
 		'</div>'
 	);
 	if(taglist != '') {