diff --git a/.bin/Scripts/functions/browsers.py b/.bin/Scripts/functions/browsers.py
index 9f51b1e6..206f6007 100644
--- a/.bin/Scripts/functions/browsers.py
+++ b/.bin/Scripts/functions/browsers.py
@@ -319,11 +319,14 @@ def get_mozilla_profiles(search_path, dev=False):
   return profiles
 
 
-def install_adblock(indent=8, width=32, just_firefox=False):
+def install_adblock(
+    indent=8, width=32, just_firefox=False, skip_firefox=False):
   """Install adblock for all supported browsers."""
   for browser in sorted(browser_data):
     if just_firefox and browser_data[browser]['base'] != 'mozilla':
       continue
+    if skip_firefox and browser_data[browser]['base'] == 'mozilla':
+      continue
     exe_path = browser_data[browser].get('exe_path', None)
     function=run_program
     if not exe_path:
diff --git a/.bin/Scripts/user_checklist.py b/.bin/Scripts/user_checklist.py
index d8e2c713..a964d920 100644
--- a/.bin/Scripts/user_checklist.py
+++ b/.bin/Scripts/user_checklist.py
@@ -64,7 +64,7 @@ if __name__ == '__main__':
     # Configure
     print_info('Configuring programs')
     if answer_config_browsers:
-      install_adblock()
+      install_adblock(skip_firefox=D7_MODE)
     if global_vars['OS']['Version'] == '10':
       if answer_config_classicshell:
         try_and_print(message='ClassicStart...',