diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index 8b3fedcd..ee65f79c 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -121,6 +121,8 @@
 
   <div id="tabs-setup" class="tab-pane">
 
+    <a class="btn pull-right" href="[% c.uri_for('/jobset' project.name jobset.name "edit") %]"><i class="icon-edit"></i> Edit</a>
+
     <table class="info-table">
       <tr>
         <th>Description:</th>
diff --git a/src/root/project.tt b/src/root/project.tt
index 4c04e83d..6b3e2415 100644
--- a/src/root/project.tt
+++ b/src/root/project.tt
@@ -79,6 +79,7 @@
   </div>
 
   <div id="tabs-settings" class="tab-pane">
+    <a class="btn pull-right" href="[% c.uri_for('/project' project.name "edit") %]"><i class="icon-edit"></i> Edit</a>
     <table class="info-table">
       <tr>
         <th>Display name:</th>
@@ -157,7 +158,6 @@
         [% FOREACH view IN views %]
           <li>
             <a href="[% c.uri_for('/view' project.name view.name) %]"><tt>[% view.name %]</tt></a>
-            <a class="btn btn-mini" href="[% c.uri_for('/view' project.name view.name "edit") %]">Edit</a>
           </li>
         [% END %]
       </ul>