diff --git a/admin/panels/entry/admin.entry.list.tpl b/admin/panels/entry/admin.entry.list.tpl
index e89427e..19f18b4 100755
--- a/admin/panels/entry/admin.entry.list.tpl
+++ b/admin/panels/entry/admin.entry.list.tpl
@@ -56,7 +56,10 @@
 {if in_array('draft',$categories)}
 (<em class="entry-flag">{$lang.entry.flags.short.draft}</em>)
 {/if}
+<a class="link-general" 
+href="{$panel_url|action_link:write}&amp;entry={$id}">
 {$subject|truncate:70} 
+</a>
 </td>
 <td>{$author}</td>
 <td><a class="link-general" 
diff --git a/admin/panels/static/admin.static.list.tpl b/admin/panels/static/admin.static.list.tpl
index e7c09c6..4695dca 100644
--- a/admin/panels/static/admin.static.list.tpl
+++ b/admin/panels/static/admin.static.list.tpl
@@ -21,7 +21,10 @@
 {*<td><input type="checkbox" /></td>*}
 <td>{$id}</td>
 <td class="main-cell">
+<a class="link-general"  
+href="{$panel_url|action_link:write}&amp;page={$id}">
 {$subject|truncate:70}
+</a>
 </td>
 <td>{$author}</td>
 <td>
diff --git a/fp-interface/themes/leggero/leggero/res/admin.css b/fp-interface/themes/leggero/leggero/res/admin.css
index 5e7bc67..09ae494 100755
--- a/fp-interface/themes/leggero/leggero/res/admin.css
+++ b/fp-interface/themes/leggero/leggero/res/admin.css
@@ -195,7 +195,10 @@ textarea.code {
 
 #admin-content td {
 	font-size: 0.8em;
-	padding: .9em;
+	/* 
+		with display:block on the main-cell link, let's disable this
+		padding: .9em;
+	*/
 	background: #e6e6e6;
 	text-align: center;
 }
@@ -521,6 +524,9 @@ a.link-enable,
 a.link-general {
 	padding: .9em;
 }
+
+td.main-cell a.link-general {display:block}
+
 a.link-disable:hover, a.link-delete:hover {
 	background-color: red;
 	color: white;
@@ -530,14 +536,13 @@ a.link-enable:hover {
 	color: white;
 }
 
-a.link-general:hover {
+a.link-general:hover, .main-cell a:hover {
 	background-color: #aaa;
 	color: black;
 }
 
 
 
-
 /* ===== NOTIFICATIONS ===== */
 .hint {
 	cursor: help;