diff --git a/features.module b/features.module
index 52704e7..8fc15b5 100644
--- a/features.module
+++ b/features.module
@@ -283,6 +283,8 @@ function features_modules_disabled($modules) {
     foreach ($modules as $module) {
       features_disable_feature($module);
     }
+    // Rebuild the list of features includes.
+    features_include(TRUE);
   }
 }
 
@@ -295,9 +297,9 @@ function features_modules_enabled($modules) {
     foreach ($modules as $module) {
       features_enable_feature($module);
     }
+    // Rebuild the list of features includes.
+    features_include(TRUE);
   }
-  // Make sure any new files are included now that a new module is enabled.
-  features_include(TRUE);
 }
 
 /**