diff --git a/mozilla/webtools/bugzilla/attachment.cgi b/mozilla/webtools/bugzilla/attachment.cgi
index d851e537ee0..67e8559c407 100755
--- a/mozilla/webtools/bugzilla/attachment.cgi
+++ b/mozilla/webtools/bugzilla/attachment.cgi
@@ -76,15 +76,6 @@ my $cgi = Bugzilla->cgi;
 # Determine whether to use the action specified by the user or the default.
 my $action = $::FORM{'action'} || 'view';
 
-# Slight awkward extra checks for the case when we came here from the
-# attachment/choose.html.tmpl page
-if ($action eq 'View') {
-    $action = 'view';
-}
-elsif ($action eq 'Edit') {
-    $action = 'edit';
-}
-
 if ($action eq "view")  
 {
   validateID();
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/choose.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/choose.html.tmpl
index b4866465344..628dafb9692 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/choose.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/choose.html.tmpl
@@ -28,8 +28,8 @@
 <form method="get" action="attachment.cgi">
   <p>Access an attachment by entering its ID into the form below:</p>
   <p>Attachment ID: <input name="id" size="6">
-  <input type="submit" name="action" value="Edit">
-  <input type="submit" name="action" value="View">
+  <button name="action" value="edit">&nbsp;Edit&nbsp;</button>
+  <button name="action" value="view">View</button>
   </p>
 </form>