diff --git a/addBm.php b/addBm.php
index 6aed6349..9329f46e 100644
--- a/addBm.php
+++ b/addBm.php
@@ -38,7 +38,8 @@ if(!isset($_GET['url']) || trim($_GET['url']) == '') {
 	$tmpl->printPage();
 	exit;
 }elseif(isset($_POST['url'])) {
-	$bm = addBookmark($_POST['url'], $_POST['title'], implode(' ',$_POST['item']['tags']),$_POST['desc'], $_POST['is_public']);
+	$tags = isset($_POST['item']['tags']) ? $_POST['item']['tags'] : array();
+	$bm = addBookmark($_POST['url'], $_POST['title'], implode(' ',$tags),$_POST['desc'], $_POST['is_public']);
 	OCP\JSON::success(array('id'=>$bm));
 	exit();
 }
@@ -48,9 +49,15 @@ OCP\Util::addscript('bookmarks','addBm');
 OCP\Util::addStyle('bookmarks', 'bookmarks');
 OCP\Util::addStyle('bookmarks', 'jquery.tagit');
 
-$datas = getURLMetadata($_GET['url']);
+if(!isset($_GET['title']) || trim($_GET['title']) == '') {
+	$datas = getURLMetadata($_GET['url']);
+	$title = isset($datas['title']) ? $datas['title'] : '';
+}
+else{
+	$title = $_GET['title'];
+}
 
-$bm = array('title'=> $datas['title'] ? $datas['title'] : '' ,
+$bm = array('title'=> $title,
 	'url'=> $_GET['url'],
 	'tags'=> array(),
 	'desc'=>'',
diff --git a/templates/bookmarklet.php b/templates/bookmarklet.php
index 6c7933c7..a456aba1 100644
--- a/templates/bookmarklet.php
+++ b/templates/bookmarklet.php
@@ -3,6 +3,6 @@
 function createBookmarklet() {
 	$l = OC_L10N::get('bookmarks');
 	echo '<small>' . $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:') . '</small>'
-	. '<a class="button bookmarklet" href="javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open(\'' . OCP\Util::linkToAbsolute('bookmarks', 'addBm.php') . '?output=popup&url=\'+c(b.location),\'bkmk_popup\',\'left=\'+((a.screenX||a.screenLeft)+10)+\',top=\'+((a.screenY||a.screenTop)+10)+\',height=400px,width=550px,resizable=1,alwaysRaised=1\');a.setTimeout(function(){d.focus()},300);})();">'
+	. '<a class="button bookmarklet" href="javascript:(function(){var a=window,b=document,c=encodeURIComponent,e=document.getElementsByTagName(\'title\')[0].textContent,d=a.open(\'' . OCP\Util::linkToAbsolute('bookmarks', 'addBm.php') . '?output=popup&url=\'+c(b.location)+\'&title=\'+e,\'bkmk_popup\',\'left=\'+((a.screenX||a.screenLeft)+10)+\',top=\'+((a.screenY||a.screenTop)+10)+\',height=400px,width=550px,resizable=1,alwaysRaised=1\');a.setTimeout(function(){d.focus()},300);})();">'
 	. $l->t('Read later') . '</a>';
 }