diff --git a/src/js/contentscript-start.js b/src/js/contentscript-start.js
index bf1da5839..90a46a098 100644
--- a/src/js/contentscript-start.js
+++ b/src/js/contentscript-start.js
@@ -134,9 +134,11 @@ var netFilters = function(details) {
 var filteringHandler = function(details) {
     var styleTagCount = vAPI.styles.length;
 
-    vAPI.skipCosmeticFiltering = !details || details.skipCosmeticFiltering;
     if ( details ) {
-        if ( details.cosmeticHide.length !== 0 || details.cosmeticDonthide.length !== 0 ) {
+        if (
+            (vAPI.skipCosmeticFiltering = details.skipCosmeticFiltering) !== true &&
+            (details.cosmeticHide.length !== 0 || details.cosmeticDonthide.length !== 0)
+        ) {
             cosmeticFilters(details);
         }
         if ( details.netHide.length !== 0 ) {
diff --git a/src/js/messaging.js b/src/js/messaging.js
index 66cb45f21..802107905 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -295,7 +295,8 @@ var popupDataFromTabId = function(tabId, tabTitle) {
         pageAllowedRequestCount: 0,
         pageBlockedRequestCount: 0,
         tabId: tabId,
-        tabTitle: tabTitle
+        tabTitle: tabTitle,
+        tooltipsDisabled: µb.userSettings.tooltipsDisabled
     };
 
     var pageStore = µb.pageStoreFromTabId(tabId);
@@ -469,8 +470,11 @@ var onMessage = function(request, sender, callback) {
 
     switch ( request.what ) {
     case 'retrieveDomainCosmeticSelectors':
-        if ( pageStore && pageStore.getSpecificCosmeticFilteringSwitch() ) {
+        if ( pageStore && pageStore.getNetFilteringSwitch() ) {
             response = µb.cosmeticFilteringEngine.retrieveDomainSelectors(request);
+            if ( response && response.skipCosmeticFiltering !== true ) {
+                response.skipCosmeticFiltering = !pageStore.getSpecificCosmeticFilteringSwitch();
+            }
         }
         break;
 
diff --git a/src/js/pagestore.js b/src/js/pagestore.js
index ed80b0298..0ce3a0688 100644
--- a/src/js/pagestore.js
+++ b/src/js/pagestore.js
@@ -447,10 +447,6 @@ PageStore.prototype.getNetFilteringSwitch = function() {
 /******************************************************************************/
 
 PageStore.prototype.getSpecificCosmeticFilteringSwitch = function() {
-    if ( this.getNetFilteringSwitch() === false ) {
-        return false;
-    }
-
     var tabContext = µb.tabContextManager.mustLookup(this.tabId);
 
     if ( µb.hnSwitches.evaluateZ('no-cosmetic-filtering', tabContext.rootHostname) ) {