diff --git a/application/basilisk/base/content/browser.css b/application/basilisk/base/content/browser.css
index c1af9d1739..6de8a8cd0c 100644
--- a/application/basilisk/base/content/browser.css
+++ b/application/basilisk/base/content/browser.css
@@ -20,7 +20,7 @@
 }
 
 #main-window[customize-entered] {
-  min-width: -moz-fit-content;
+  min-width: fit-content;
 }
 
 searchbar {
diff --git a/application/basilisk/components/preferences/in-content/applications.js b/application/basilisk/components/preferences/in-content/applications.js
index 6f29896576..07072195ab 100644
--- a/application/basilisk/components/preferences/in-content/applications.js
+++ b/application/basilisk/components/preferences/in-content/applications.js
@@ -1076,11 +1076,26 @@ var gApplicationsPane = {
       if (mimeType.type in this._handledTypes) {
         handlerInfoWrapper = this._handledTypes[mimeType.type];
       } else {
-        let wrappedHandlerInfo =
+        if (mimeType.type == '') {
+          // If an incorrect empty MIME type is present, don't break.
+          continue;
+        }
+        try {
+          let wrappedHandlerInfo =
               this._mimeSvc.getFromTypeAndExtension(mimeType.type, null);
-        handlerInfoWrapper = new HandlerInfoWrapper(mimeType.type, wrappedHandlerInfo);
-        handlerInfoWrapper.handledOnlyByPlugin = true;
-        this._handledTypes[mimeType.type] = handlerInfoWrapper;
+          handlerInfoWrapper = new HandlerInfoWrapper(mimeType.type, wrappedHandlerInfo);
+          handlerInfoWrapper.handledOnlyByPlugin = true;
+          this._handledTypes[mimeType.type] = handlerInfoWrapper;
+          #ifdef DEBUG
+          console.log("Enumerate MIME type: " + mimeType.type);
+          #endif
+        } catch(e) {
+          #ifdef DEBUG
+          console.log("Error fetching MIME type info for " + mimeType.type);
+          console.log(e);
+          #endif
+          continue;
+        }
       }
       handlerInfoWrapper.pluginName = mimeType.enabledPlugin.name;
     }
diff --git a/application/basilisk/components/preferences/in-content/jar.mn b/application/basilisk/components/preferences/in-content/jar.mn
index 216901ffe2..c1aa20559b 100644
--- a/application/basilisk/components/preferences/in-content/jar.mn
+++ b/application/basilisk/components/preferences/in-content/jar.mn
@@ -11,7 +11,7 @@ browser.jar:
 *  content/browser/preferences/in-content/privacy.js
    content/browser/preferences/in-content/containers.js
    content/browser/preferences/in-content/advanced.js
-   content/browser/preferences/in-content/applications.js
+*  content/browser/preferences/in-content/applications.js
 *  content/browser/preferences/in-content/content.js
 #ifdef MOZ_SERVICES_SYNC
    content/browser/preferences/in-content/sync.js