diff --git a/src/root/common.tt b/src/root/common.tt
index bbf4ced3..1f900282 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -273,11 +273,6 @@
     since [% INCLUDE renderDateTime timestamp = build.starttime %]
   [% ELSE %]
     <strong>Scheduled to be built</strong>
-    [% IF c.user_exists %]
-      <form action="[% c.uri_for('/build' build.id 'cancel') %]" method="post" class="inline">
-        <button id="cancel" type="submit">Cancel</button>
-      </form>
-    [% END %]
   [% END %] 
 [% END -%]
 
diff --git a/src/root/topbar.tt b/src/root/topbar.tt
index 6c822120..4f9e5124 100644
--- a/src/root/topbar.tt
+++ b/src/root/topbar.tt
@@ -145,6 +145,9 @@
           [% INCLUDE makeLink
             uri = c.uri_for('/build' build.id 'restart')
             title = "Restart build" %]
+          [% INCLUDE makeLink
+            uri = c.uri_for('/build' build.id 'cancel')
+            title = "Cancel build" %]
       [% END %]
 
     [% END %]