diff --git a/css/bookmarks.css b/css/bookmarks.css
index 7818894e..5f2bde50 100644
--- a/css/bookmarks.css
+++ b/css/bookmarks.css
@@ -104,28 +104,30 @@ input.disabled, input.disabled:hover, input.disabled:focus {
 }
 
 .bookmark_single:hover {
-	background-color:#f8f8f8
+	background-color:#f8f8f8;
 }
 
 .bookmark_single:hover .bookmark_actions {
 	display: block;
 }
 
-.bookmark_edit_btn {
-        position: absolute;
-        top: 0.6em;
-        left: 21%;
+.bookmark_title {
+	font-weight: bold;
+	display: inline-block;
+	margin-right: 0.8em;
+	margin-top:0.7em;
 }
 
-.bookmark_title {
-        font-weight: bold;
-        display: inline-block;
-        margin-right: 0.8em;
-		margin-top:0.7em;
-        width: 20%;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
+.bookmark_title a {
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	display: inline-block;
+	max-width: 15em;
+}
+
+.bookmark_single:hover .bookmark_title .bookmark_edit_btn {
+	display:inline-block;
 }
 
 .bm_view_list .bookmark_tags {
diff --git a/templates/js_tpl.php b/templates/js_tpl.php
index 75b39a85..3b94f0fa 100644
--- a/templates/js_tpl.php
+++ b/templates/js_tpl.php
@@ -10,15 +10,12 @@
 					<a href="<%= encodeURI(url) %>" target="_blank" class="bookmark_link">
 						<%= escapeHTML(title == '' ? encodeURI(url) : title ) %>
 					</a>
-                                    	<span class="bookmark_desc"><%= escapeHTML(description)%> </span>
-                                        <span class="bookmark_date"><%= formatDate(added_date) %></span>
-				</p>
-                                <div class="bookmark_edit_btn">
-                                        <span class="bookmark_edit">
-						<img class="svg" src="<?php echo OCP\image_path("", "actions/rename.svg");?>"
-							title="<?php echo $l->t('Edit');?>">
+					<span class="bookmark_edit bookmark_edit_btn">
+						<img class="svg" src="<?php echo OCP\image_path("", "actions/rename.svg");?>" title="<?php echo $l->t('Edit');?>">
 					</span>
-                                </div>
+				</p>
+				<span class="bookmark_desc"><%= escapeHTML(description)%> </span>
+				<span class="bookmark_date"><%= formatDate(added_date) %></span>
 			</div>
 </script>