diff --git a/xpfe/components/prefwindow/resources/content/pref-applications.js b/xpfe/components/prefwindow/resources/content/pref-applications.js
index ecf55f51964f..5f088fa75dcf 100644
--- a/xpfe/components/prefwindow/resources/content/pref-applications.js
+++ b/xpfe/components/prefwindow/resources/content/pref-applications.js
@@ -107,6 +107,10 @@ function selectApplication()
     delete handlerOverride;
   } else {
     updateLockedButtonState(false)
+    gHandlerField.removeAttribute("value");
+    document.getElementById("contentTypeImage").removeAttribute("src");
+    gExtensionField.removeAttribute("value");
+    gMIMETypeField.removeAttribute("value");
   }
 }