diff --git a/common/content/commandline.js b/common/content/commandline.js
index 620ab9c6..a1da650f 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -2255,7 +2255,7 @@ var ItemList = Class("ItemList", {
 
             let win = this.win;
             let row = this.selectedRow;
-            if (row) {
+            if (row && this.parent.minHeight) {
                 let { rect } = DOM(this.selectedRow);
                 var scrollY = this.win.scrollY + rect.bottom - this.win.innerHeight;
             }
diff --git a/common/modules/dom.jsm b/common/modules/dom.jsm
index ea3e857f..72bd775d 100644
--- a/common/modules/dom.jsm
+++ b/common/modules/dom.jsm
@@ -98,24 +98,7 @@ var DOM = Class("DOM", {
         }]
     ]),
 
-    matcher: function matcher(sel) {
-        let res;
-
-        if (/^([a-z0-9_-]+)$/i.exec(sel))
-            res = function (elem) elem.localName == val;
-        else if (/^#([a-z0-9:_-]+)$/i.exec(sel))
-            res = function (elem) elem.id == val;
-        else if (/^\.([a-z0-9:_-]+)$/i.exec(sel))
-            res = function (elem) elem.classList.contains(val);
-        else if (/^\[([a-z0-9:_-]+)\]$/i.exec(sel))
-            res = function (elem) elem.hasAttribute(val);
-        else
-            res = function (elem) ~Array.indexOf(elem.parentNode.querySelectorAll(sel),
-                                                 elem);
-
-        let val = RegExp.$1;
-        return res;
-    },
+    matcher: function matcher(sel) function (elem) elem.mozMatchesSelector && elem.mozMatchesSelector(sel),
 
     each: function each(fn, self) {
         let obj = self || this.Empty();