diff --git a/src/core/core.config.js b/src/core/core.config.js
index d30ed3296..8a47782c9 100644
--- a/src/core/core.config.js
+++ b/src/core/core.config.js
@@ -173,7 +173,12 @@ export default class Config {
 	 */
   datasetScopeKeys(datasetType) {
     return cachedKeys(datasetType,
-      () => [`datasets.${datasetType}`, `controllers.${datasetType}.datasets`, '']);
+      () => [
+        `datasets.${datasetType}`,
+        `controllers.${datasetType}`,
+        `controllers.${datasetType}.datasets`,
+        ''
+      ]);
   }
 
   /**
@@ -186,6 +191,7 @@ export default class Config {
     return cachedKeys(`${datasetType}.animation`,
       () => [
         `datasets.${datasetType}.animation`,
+        `controllers.${datasetType}.animation`,
         `controllers.${datasetType}.datasets.animation`,
         'animation'
       ]);