diff --git a/src/css/epicker-ui.css b/src/css/epicker-ui.css
index 8ce5ade80..1923142b2 100644
--- a/src/css/epicker-ui.css
+++ b/src/css/epicker-ui.css
@@ -73,8 +73,8 @@ html#ublock0-epicker,
 #ublock0-epicker section .codeMirrorContainer {
     border: none;
     box-sizing: border-box;
-    height: 6em;
-    max-height: min(6em, 10vh);
+    height: 10em;
+    max-height: min(10em, 10vh);
     min-height: 1em;
     padding: 2px;
     width: 100%;
@@ -177,7 +177,7 @@ html#ublock0-epicker,
     overflow: hidden;
 }
 #ublock0-epicker #candidateFilters {
-    max-height: min(12em, 18vh);
+    max-height: min(18em, 18vh);
     overflow-y: auto;
 }
 #ublock0-epicker .changeFilter > li > span:nth-of-type(1) {
diff --git a/src/js/scriptlets/epicker.js b/src/js/scriptlets/epicker.js
index e127540d1..106941a2b 100644
--- a/src/js/scriptlets/epicker.js
+++ b/src/js/scriptlets/epicker.js
@@ -896,19 +896,6 @@ const onOptimizeCandidates = function(details) {
         return a.selector.length - b.selector.length;
     });
 
-    // If two candidates have the same count of matching elements, replace
-    // the less specific cosmetic filters with the more specific one if the
-    // less specific one has an id and is simpler
-    for ( let i = 0, n = results.length-1; i < n; i++ ) {
-        const a = results[i+0];
-        const b = results[i+1];
-        if ( b.count !== a.count ) { continue; }
-        if ( b.selector.length <= a.selector.length ) { continue; }
-        if ( a.selector.startsWith('#') === false ) { continue; }
-        if ( b.selector.length < a.selector.length ) { continue; }
-        b.selector = a.selector;
-    }
-
     pickerFramePort.postMessage({
         what: 'candidatesOptimized',
         candidates: results.map(a => a.selector),