diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
index 4d6550b4b..85434ce9d 100644
--- a/src/js/static-net-filtering.js
+++ b/src/js/static-net-filtering.js
@@ -1735,7 +1735,7 @@ FilterContainer.prototype.getFilterClass = function(details) {
         if ( details.isRegex ) {
             return FilterRegexHostname;
         }
-        if ( this.reIsGeneric.test(s) ) {
+        if ( this.reIsGeneric.test(s) || details.token === '*' ) {
             if ( details.hostnameAnchored ) {
                 return FilterGenericHnAnchoredHostname;
             }
@@ -1766,7 +1766,7 @@ FilterContainer.prototype.getFilterClass = function(details) {
     if ( details.isRegex ) {
         return FilterRegex;
     }
-    if ( this.reIsGeneric.test(s) ) {
+    if ( this.reIsGeneric.test(s) || details.token === '*' ) {
         if ( details.hostnameAnchored ) {
             return FilterGenericHnAnchored;
         }