diff --git a/mozilla/webtools/bugzilla/js/attachment.js b/mozilla/webtools/bugzilla/js/attachment.js
index c05d1d3ea60..2543316799f 100644
--- a/mozilla/webtools/bugzilla/js/attachment.js
+++ b/mozilla/webtools/bugzilla/js/attachment.js
@@ -100,7 +100,12 @@ function clearAttachmentFields() {
         URLFieldHandler();
     }
     document.getElementById('description').value = '';
-    document.getElementById('ispatch').checked = '';
+    /* Fire onchange so that the disabled state of the content-type
+     * radio buttons are also reset 
+     */
+    element = document.getElementById('ispatch');
+    element.checked = '';
+    bz_fireEvent(element, 'change');
     if ((element = document.getElementById('isprivate')))
         element.checked = '';
 }
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/create.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/create.html.tmpl
index 10648159b89..687cd7cbf24 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/create.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/create.html.tmpl
@@ -33,9 +33,8 @@
   title = title
   header = header
   subheader = subheader
-  onload="setContentTypeDisabledState(document.entryform);"
   style_urls = [ 'skins/standard/create_attachment.css' ]
-  javascript_urls = [ "js/attachment.js" ]
+  javascript_urls = [ "js/attachment.js", "js/util.js" ]
   doc_section = "attachments.html"
 %]
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/createformcontents.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/createformcontents.html.tmpl
index 2fc80a51848..2cef632d185 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/createformcontents.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/createformcontents.html.tmpl
@@ -70,6 +70,12 @@
     <input type="checkbox" id="ispatch" name="ispatch" value="1"
            onchange="setContentTypeDisabledState(this.form);">
     <label for="ispatch">patch</label><br><br>
+    [%# Reset this whenever the page loads so that the JS state is up to date %]
+    <script type="text/javascript">
+      YAHOO.util.Event.onDOMReady(function() {
+          bz_fireEvent(document.getElementById('ispatch'), 'change');
+      });
+    </script>
 
     <em>Otherwise, choose a method for determining the content type.</em><br>
     <input type="radio" id="autodetect"