diff --git a/ajax/getInfos.php b/ajax/getInfos.php
new file mode 100644
index 00000000..e164401e
--- /dev/null
+++ b/ajax/getInfos.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+* ownCloud - bookmarks plugin
+*
+* @author Brice Maron
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+// Check if we are a user
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('bookmarks');
+
+require_once(OC_App::getAppPath('bookmarks').'/bookmarksHelper.php');
+
+$req_type=isset($_GET['type']) ? $_GET['type'] : '';
+
+if($req_type == 'url_info' && $_GET['url']) {
+  $datas = getURLMetadata($_GET['url']);
+	$title = isset($datas['title']) ? $datas['title'] : '';
+	OCP\JSON::success(array('title' => $title));
+	exit();
+}
+
+OC_JSON::error();
+exit();
diff --git a/js/addBm.js b/js/addBm.js
index 4a9c1cfe..bfab8117 100644
--- a/js/addBm.js
+++ b/js/addBm.js
@@ -28,6 +28,9 @@
 			});
       return false;
     }
+		base.setTitle = function (str) {
+			base.$el.find('.title').val(str);
+		}
 		
     base.init = function(){
       base.options = $.extend({},$.bookmark_dialog.defaultOptions, options);
@@ -45,8 +48,10 @@
 				base.$el.find('.url_input').val(record.url);
 				base.$el.find('.desc').val(record.description);
 				tagit_elem = base.$el.find('.tags');
-				for(var i=0;i<record.tags.length;i++) {
-					tagit_elem.tagit('createTag', record.tags[i]);
+				if(record.tags) {
+					for(var i=0;i<record.tags.length;i++) {
+						tagit_elem.tagit('createTag', record.tags[i]);
+					}
 				}
 			}
 
diff --git a/js/bookmarks.js b/js/bookmarks.js
index fb5cd926..89715f0b 100644
--- a/js/bookmarks.js
+++ b/js/bookmarks.js
@@ -1,6 +1,6 @@
 var bookmarks_page = 0;
 var bookmarks_loading = false;
-
+var dialog;
 var bookmarks_sorting = 'bookmarks_sorting_recent';
 
 var bookmark_view = 'image';
@@ -173,7 +173,7 @@ function getBookmarks() {
 
 function createEditDialog(record){
 	dialog_html = $('#edit_dialog').html();
-	var dialog = $(dialog_html).dialog({
+	var oc_dialog= $(dialog_html).dialog({
 		width : 620,
 		height: 350,
 		title: t('bookmark', 'Edit bookmark'),
@@ -193,7 +193,20 @@ function createEditDialog(record){
 }
 
 function addBookmark(event) {
-	createEditDialog();
+	url = $('#add_url').val();
+	createEditDialog({ url: url});
+	$('#add_url').val('');
+
+	$.ajax({
+		type: 'GET',
+		url: OC.filePath('bookmarks', 'ajax', 'getInfos.php'),
+		data: { type: 'url_info', url: url},
+		success: function(data){
+			if (data.status == 'success') {
+				$('.ui-dialog').data('bookmark_dialog').setTitle(data.title);
+			}
+		}
+	});
 }
 
 function delBookmark(event) {
diff --git a/templates/list.php b/templates/list.php
index 79fc3859..c2d8a8f0 100644
--- a/templates/list.php
+++ b/templates/list.php
@@ -9,7 +9,8 @@
 ?>
 <input type="hidden" id="bookmarkFilterTag" value="<?php echo $_['req_tag']; ?>" />
 <div id="controls">
-	<input type="submit" value="<?php echo $l->t('New bookmark'); ?>" id="bookmark_add_submit" />
+	<input type="text" id="add_url" value="" placeholder="<?php echo $l->t('Address'); ?>"/>
+	<input type="submit" value="<?php echo $l->t('Add bookmark'); ?>" id="bookmark_add_submit" />
 
 	<div id="view_type">
 		<input type="button" class="list" value="<?php echo $l->t('List')?>" />