diff --git a/.bin/Scripts/install_sw_bundle.py b/.bin/Scripts/install_sw_bundle.py
index e544dde4..9b51c432 100644
--- a/.bin/Scripts/install_sw_bundle.py
+++ b/.bin/Scripts/install_sw_bundle.py
@@ -27,13 +27,14 @@ if __name__ == '__main__':
       }}
     answer_extensions = D7_MODE or ask('Install Extensions?')
     answer_vcr = D7_MODE or ask('Install Visual C++ Runtimes?')
-    answer_ninite = D7_MODE or ask('Install Ninite Bundle?')
-    if not D7_MODE and (
-      answer_ninite and global_vars['OS']['Version'] in ['7']):
-      # Vista is dead, not going to check for it
-      answer_mse = ask('Install MSE?')
-    else:
+    if D7_MODE:
+      answer_ninite = False
       answer_mse = False
+    else:
+      answer_ninite = ask('Install Ninite Bundle?')
+      if answer_ninite and global_vars['OS']['Version'] in ['7']:
+      # Vista is dead, not going to check for it
+        answer_mse = ask('Install MSE?')
 
     print_info('Installing Programs')
     if answer_vcr: